Merge pull request #15 from kmc7468/dev

v0.6.0
Merge pull request #13 from kmc7468/dev
2026-02-04 16:16:55 +00:00 · 2025-12-27 14:22:26 +09:00 · 2025-07-12 19:56:12 +09:00 · 2025-07-12 06:01:08 +09:00 · 2025-01-30 21:06:50 +09:00 · 2025-01-18 13:29:09 +09:00
77 changed files with 2142 additions and 2313 deletions
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "arkvault",
  "private": true,
-  "version": "0.7.0",
+  "version": "0.6.0",
  "type": "module",
  "scripts": {
    "dev": "vite dev",
@@ -17,12 +17,11 @@
  },
  "devDependencies": {
    "@eslint/compat": "^2.0.0",
-    "@eslint/js": "^9.39.2",
    "@iconify-json/material-symbols": "^1.2.50",
    "@sveltejs/adapter-node": "^5.4.0",
    "@sveltejs/kit": "^2.49.2",
    "@sveltejs/vite-plugin-svelte": "^6.2.1",
-    "@tanstack/svelte-virtual": "^3.13.15",
+    "@tanstack/svelte-virtual": "^3.13.13",
    "@trpc/client": "^11.8.1",
    "@types/file-saver": "^2.0.7",
    "@types/ms": "^0.7.34",
@@ -50,7 +49,7 @@
    "svelte-check": "^4.3.5",
    "tailwindcss": "^3.4.19",
    "typescript": "^5.9.3",
-    "typescript-eslint": "^8.51.0",
+    "typescript-eslint": "^8.50.1",
    "unplugin-icons": "^22.5.0",
    "vite": "^7.3.0"
  },
@@ -64,7 +63,7 @@
    "pg": "^8.16.3",
    "superjson": "^2.2.6",
    "uuid": "^13.0.0",
-    "zod": "^4.3.4"
+    "zod": "^4.2.1"
  },
  "engines": {
    "node": "^22.0.0",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -36,15 +36,12 @@ importers:
        specifier: ^13.0.0
        version: 13.0.0
      zod:
-        specifier: ^4.3.4
-        version: 4.3.4
+        specifier: ^4.2.1
+        version: 4.2.1
    devDependencies:
      '@eslint/compat':
        specifier: ^2.0.0
        version: 2.0.0(eslint@9.39.2(jiti@1.21.7))
-      '@eslint/js':
-        specifier: ^9.39.2
-        version: 9.39.2
      '@iconify-json/material-symbols':
        specifier: ^1.2.50
        version: 1.2.50
@@ -58,8 +55,8 @@ importers:
        specifier: ^6.2.1
        version: 6.2.1(svelte@5.46.1)(vite@7.3.0(@types/node@25.0.3)(jiti@1.21.7)(yaml@2.8.0))
      '@tanstack/svelte-virtual':
-        specifier: ^3.13.15
-        version: 3.13.15(svelte@5.46.1)
+        specifier: ^3.13.13
+        version: 3.13.13(svelte@5.46.1)
      '@trpc/client':
        specifier: ^11.8.1
        version: 11.8.1(@trpc/server@11.8.1(typescript@5.9.3))(typescript@5.9.3)
@@ -142,8 +139,8 @@ importers:
        specifier: ^5.9.3
        version: 5.9.3
      typescript-eslint:
-        specifier: ^8.51.0
-        version: 8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+        specifier: ^8.50.1
+        version: 8.50.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
      unplugin-icons:
        specifier: ^22.5.0
        version: 22.5.0(svelte@5.46.1)
@@ -319,8 +316,8 @@ packages:
    cpu: [x64]
    os: [win32]

-  '@eslint-community/eslint-utils@4.9.1':
-    resolution: {integrity: sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==}
+  '@eslint-community/eslint-utils@4.9.0':
+    resolution: {integrity: sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    peerDependencies:
      eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
@@ -620,13 +617,13 @@ packages:
      svelte: ^5.0.0
      vite: ^6.3.0 || ^7.0.0

-  '@tanstack/svelte-virtual@3.13.15':
-    resolution: {integrity: sha512-3PPLI3hsyT70zSZhBkSIZXIarlN+GjFNKeKr2Wk1UR7EuEVtXgNlB/Zk0sYtaeJ4CvGvldQNakOvbdETnWAgeA==}
+  '@tanstack/svelte-virtual@3.13.13':
+    resolution: {integrity: sha512-VDOvbRw3R+XBQdFodEJ4E7AOmEyo3Bmr4zL4DLVnJ0fxICdbvY5F5t8zSwJ4f7lqjckXi0yKFzY8WBtjaNbsGQ==}
    peerDependencies:
      svelte: ^3.48.0 || ^4.0.0 || ^5.0.0

-  '@tanstack/virtual-core@3.13.15':
-    resolution: {integrity: sha512-8cG3acM2cSIm3h8WxboHARAhQAJbYUhvmadvnN8uz8aziDwrbYb9KiARni+uY2qrLh49ycn+poGoxvtIAKhjog==}
+  '@tanstack/virtual-core@3.13.13':
+    resolution: {integrity: sha512-uQFoSdKKf5S8k51W5t7b2qpfkyIbdHMzAn+AMQvHPxKUPeo1SsGaA4JRISQT87jm28b7z8OEqPcg1IOZagQHcA==}

  '@trpc/client@11.8.1':
    resolution: {integrity: sha512-L/SJFGanr9xGABmuDoeXR4xAdHJmsXsiF9OuH+apecJ+8sUITzVT1EPeqp0ebqA6lBhEl5pPfg3rngVhi/h60Q==}
@@ -666,63 +663,63 @@ packages:
  '@types/resolve@1.20.2':
    resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==}

-  '@typescript-eslint/eslint-plugin@8.51.0':
-    resolution: {integrity: sha512-XtssGWJvypyM2ytBnSnKtHYOGT+4ZwTnBVl36TA4nRO2f4PRNGz5/1OszHzcZCvcBMh+qb7I06uoCmLTRdR9og==}
+  '@typescript-eslint/eslint-plugin@8.50.1':
+    resolution: {integrity: sha512-PKhLGDq3JAg0Jk/aK890knnqduuI/Qj+udH7wCf0217IGi4gt+acgCyPVe79qoT+qKUvHMDQkwJeKW9fwl8Cyw==}
    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
    peerDependencies:
-      '@typescript-eslint/parser': ^8.51.0
+      '@typescript-eslint/parser': ^8.50.1
      eslint: ^8.57.0 || ^9.0.0
      typescript: '>=4.8.4 <6.0.0'

-  '@typescript-eslint/parser@8.51.0':
-    resolution: {integrity: sha512-3xP4XzzDNQOIqBMWogftkwxhg5oMKApqY0BAflmLZiFYHqyhSOxv/cd/zPQLTcCXr4AkaKb25joocY0BD1WC6A==}
+  '@typescript-eslint/parser@8.50.1':
+    resolution: {integrity: sha512-hM5faZwg7aVNa819m/5r7D0h0c9yC4DUlWAOvHAtISdFTc8xB86VmX5Xqabrama3wIPJ/q9RbGS1worb6JfnMg==}
    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
    peerDependencies:
      eslint: ^8.57.0 || ^9.0.0
      typescript: '>=4.8.4 <6.0.0'

-  '@typescript-eslint/project-service@8.51.0':
-    resolution: {integrity: sha512-Luv/GafO07Z7HpiI7qeEW5NW8HUtZI/fo/kE0YbtQEFpJRUuR0ajcWfCE5bnMvL7QQFrmT/odMe8QZww8X2nfQ==}
+  '@typescript-eslint/project-service@8.50.1':
+    resolution: {integrity: sha512-E1ur1MCVf+YiP89+o4Les/oBAVzmSbeRB0MQLfSlYtbWU17HPxZ6Bhs5iYmKZRALvEuBoXIZMOIRRc/P++Ortg==}
    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
    peerDependencies:
      typescript: '>=4.8.4 <6.0.0'

-  '@typescript-eslint/scope-manager@8.51.0':
-    resolution: {integrity: sha512-JhhJDVwsSx4hiOEQPeajGhCWgBMBwVkxC/Pet53EpBVs7zHHtayKefw1jtPaNRXpI9RA2uocdmpdfE7T+NrizA==}
+  '@typescript-eslint/scope-manager@8.50.1':
+    resolution: {integrity: sha512-mfRx06Myt3T4vuoHaKi8ZWNTPdzKPNBhiblze5N50//TSHOAQQevl/aolqA/BcqqbJ88GUnLqjjcBc8EWdBcVw==}
    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}

-  '@typescript-eslint/tsconfig-utils@8.51.0':
-    resolution: {integrity: sha512-Qi5bSy/vuHeWyir2C8u/uqGMIlIDu8fuiYWv48ZGlZ/k+PRPHtaAu7erpc7p5bzw2WNNSniuxoMSO4Ar6V9OXw==}
+  '@typescript-eslint/tsconfig-utils@8.50.1':
+    resolution: {integrity: sha512-ooHmotT/lCWLXi55G4mvaUF60aJa012QzvLK0Y+Mp4WdSt17QhMhWOaBWeGTFVkb2gDgBe19Cxy1elPXylslDw==}
    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
    peerDependencies:
      typescript: '>=4.8.4 <6.0.0'

-  '@typescript-eslint/type-utils@8.51.0':
-    resolution: {integrity: sha512-0XVtYzxnobc9K0VU7wRWg1yiUrw4oQzexCG2V2IDxxCxhqBMSMbjB+6o91A+Uc0GWtgjCa3Y8bi7hwI0Tu4n5Q==}
+  '@typescript-eslint/type-utils@8.50.1':
+    resolution: {integrity: sha512-7J3bf022QZE42tYMO6SL+6lTPKFk/WphhRPe9Tw/el+cEwzLz1Jjz2PX3GtGQVxooLDKeMVmMt7fWpYRdG5Etg==}
    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
    peerDependencies:
      eslint: ^8.57.0 || ^9.0.0
      typescript: '>=4.8.4 <6.0.0'

-  '@typescript-eslint/types@8.51.0':
-    resolution: {integrity: sha512-TizAvWYFM6sSscmEakjY3sPqGwxZRSywSsPEiuZF6d5GmGD9Gvlsv0f6N8FvAAA0CD06l3rIcWNbsN1e5F/9Ag==}
+  '@typescript-eslint/types@8.50.1':
+    resolution: {integrity: sha512-v5lFIS2feTkNyMhd7AucE/9j/4V9v5iIbpVRncjk/K0sQ6Sb+Np9fgYS/63n6nwqahHQvbmujeBL7mp07Q9mlA==}
    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}

-  '@typescript-eslint/typescript-estree@8.51.0':
-    resolution: {integrity: sha512-1qNjGqFRmlq0VW5iVlcyHBbCjPB7y6SxpBkrbhNWMy/65ZoncXCEPJxkRZL8McrseNH6lFhaxCIaX+vBuFnRng==}
+  '@typescript-eslint/typescript-estree@8.50.1':
+    resolution: {integrity: sha512-woHPdW+0gj53aM+cxchymJCrh0cyS7BTIdcDxWUNsclr9VDkOSbqC13juHzxOmQ22dDkMZEpZB+3X1WpUvzgVQ==}
    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
    peerDependencies:
      typescript: '>=4.8.4 <6.0.0'

-  '@typescript-eslint/utils@8.51.0':
-    resolution: {integrity: sha512-11rZYxSe0zabiKaCP2QAwRf/dnmgFgvTmeDTtZvUvXG3UuAdg/GU02NExmmIXzz3vLGgMdtrIosI84jITQOxUA==}
+  '@typescript-eslint/utils@8.50.1':
+    resolution: {integrity: sha512-lCLp8H1T9T7gPbEuJSnHwnSuO9mDf8mfK/Nion5mZmiEaQD9sWf9W4dfeFqRyqRjF06/kBuTmAqcs9sewM2NbQ==}
    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
    peerDependencies:
      eslint: ^8.57.0 || ^9.0.0
      typescript: '>=4.8.4 <6.0.0'

-  '@typescript-eslint/visitor-keys@8.51.0':
-    resolution: {integrity: sha512-mM/JRQOzhVN1ykejrvwnBRV3+7yTKK8tVANVN3o1O0t0v7o+jqdVu9crPy5Y9dov15TJk/FTIgoUGHrTOVL3Zg==}
+  '@typescript-eslint/visitor-keys@8.50.1':
+    resolution: {integrity: sha512-IrDKrw7pCRUR94zeuCSUWQ+w8JEf5ZX5jl/e6AHGSLi1/zIr0lgutfn/7JpfCey+urpgQEdrZVYzCaVVKiTwhQ==}
    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}

  '@xmldom/xmldom@0.9.8':
@@ -830,8 +827,8 @@ packages:
    resolution: {integrity: sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==}
    engines: {node: '>= 6'}

-  caniuse-lite@1.0.30001762:
-    resolution: {integrity: sha512-PxZwGNvH7Ak8WX5iXzoK1KPZttBXNPuaOvI2ZYU7NrlM+d9Ov+TUvlLOBNGzVXAntMSMMlJPd+jY6ovrVjSmUw==}
+  caniuse-lite@1.0.30001761:
+    resolution: {integrity: sha512-JF9ptu1vP2coz98+5051jZ4PwQgd2ni8A+gYSN7EA7dPKIMf0pDlSUxhdmVOaV3/fYK5uWBkgSXJaRLr4+3A6g==}

  chalk@4.1.2:
    resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
@@ -1042,8 +1039,8 @@ packages:
    resolution: {integrity: sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==}
    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}

-  esquery@1.7.0:
-    resolution: {integrity: sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==}
+  esquery@1.6.0:
+    resolution: {integrity: sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==}
    engines: {node: '>=0.10'}

  esrap@2.2.1:
@@ -1857,8 +1854,8 @@ packages:
    resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==}
    engines: {node: '>=6'}

-  ts-api-utils@2.4.0:
-    resolution: {integrity: sha512-3TaVTaAv2gTiMB35i3FiGJaRfwb3Pyn/j3m/bfAvGe8FB7CF6u+LMYqYlDh7reQf7UNvoTvdfAqHGmPGOSsPmA==}
+  ts-api-utils@2.1.0:
+    resolution: {integrity: sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==}
    engines: {node: '>=18.12'}
    peerDependencies:
      typescript: '>=4.8.4'
@@ -1880,8 +1877,8 @@ packages:
    resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
    engines: {node: '>= 0.8.0'}

-  typescript-eslint@8.51.0:
-    resolution: {integrity: sha512-jh8ZuM5oEh2PSdyQG9YAEM1TCGuWenLSuSUhf/irbVUNW9O5FhbFVONviN2TgMTBnUmyHv7E56rYnfLZK6TkiA==}
+  typescript-eslint@8.50.1:
+    resolution: {integrity: sha512-ytTHO+SoYSbhAH9CrYnMhiLx8To6PSSvqnvXyPUgPETCvB6eBKmTI9w6XMPS3HsBRGkwTVBX+urA8dYQx6bHfQ==}
    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
    peerDependencies:
      eslint: ^8.57.0 || ^9.0.0
@@ -2025,8 +2022,8 @@ packages:
  zimmerframe@1.1.4:
    resolution: {integrity: sha512-B58NGBEoc8Y9MWWCQGl/gq9xBCe4IiKM0a2x7GZdQKOW5Exr8S1W24J6OgM1njK8xCRGvAJIL/MxXHf6SkmQKQ==}

-  zod@4.3.4:
-    resolution: {integrity: sha512-Zw/uYiiyF6pUT1qmKbZziChgNPRu+ZRneAsMUDU6IwmXdWt5JwcUfy2bvLOCUtz5UniaN/Zx5aFttZYbYc7O/A==}
+  zod@4.2.1:
+    resolution: {integrity: sha512-0wZ1IRqGGhMP76gLqz8EyfBXKk0J2qo2+H3fi4mcUP/KtTocoX08nmIAHl1Z2kJIZbZee8KOpBCSNPRgauucjw==}

 snapshots:

@@ -2117,7 +2114,7 @@ snapshots:
  '@esbuild/win32-x64@0.27.2':
    optional: true

-  '@eslint-community/eslint-utils@4.9.1(eslint@9.39.2(jiti@1.21.7))':
+  '@eslint-community/eslint-utils@4.9.0(eslint@9.39.2(jiti@1.21.7))':
    dependencies:
      eslint: 9.39.2(jiti@1.21.7)
      eslint-visitor-keys: 3.4.3
@@ -2389,12 +2386,12 @@ snapshots:
    transitivePeerDependencies:
      - supports-color

-  '@tanstack/svelte-virtual@3.13.15(svelte@5.46.1)':
+  '@tanstack/svelte-virtual@3.13.13(svelte@5.46.1)':
    dependencies:
-      '@tanstack/virtual-core': 3.13.15
+      '@tanstack/virtual-core': 3.13.13
      svelte: 5.46.1

-  '@tanstack/virtual-core@3.13.15': {}
+  '@tanstack/virtual-core@3.13.13': {}

  '@trpc/client@11.8.1(@trpc/server@11.8.1(typescript@5.9.3))(typescript@5.9.3)':
    dependencies:
@@ -2431,95 +2428,95 @@ snapshots:

  '@types/resolve@1.20.2': {}

-  '@typescript-eslint/eslint-plugin@8.51.0(@typescript-eslint/parser@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
+  '@typescript-eslint/eslint-plugin@8.50.1(@typescript-eslint/parser@8.50.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
    dependencies:
      '@eslint-community/regexpp': 4.12.2
-      '@typescript-eslint/parser': 8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-      '@typescript-eslint/scope-manager': 8.51.0
-      '@typescript-eslint/type-utils': 8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-      '@typescript-eslint/utils': 8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-      '@typescript-eslint/visitor-keys': 8.51.0
+      '@typescript-eslint/parser': 8.50.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/scope-manager': 8.50.1
+      '@typescript-eslint/type-utils': 8.50.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.50.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/visitor-keys': 8.50.1
      eslint: 9.39.2(jiti@1.21.7)
      ignore: 7.0.5
      natural-compare: 1.4.0
-      ts-api-utils: 2.4.0(typescript@5.9.3)
+      ts-api-utils: 2.1.0(typescript@5.9.3)
      typescript: 5.9.3
    transitivePeerDependencies:
      - supports-color

-  '@typescript-eslint/parser@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
+  '@typescript-eslint/parser@8.50.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
    dependencies:
-      '@typescript-eslint/scope-manager': 8.51.0
-      '@typescript-eslint/types': 8.51.0
-      '@typescript-eslint/typescript-estree': 8.51.0(typescript@5.9.3)
-      '@typescript-eslint/visitor-keys': 8.51.0
+      '@typescript-eslint/scope-manager': 8.50.1
+      '@typescript-eslint/types': 8.50.1
+      '@typescript-eslint/typescript-estree': 8.50.1(typescript@5.9.3)
+      '@typescript-eslint/visitor-keys': 8.50.1
      debug: 4.4.3
      eslint: 9.39.2(jiti@1.21.7)
      typescript: 5.9.3
    transitivePeerDependencies:
      - supports-color

-  '@typescript-eslint/project-service@8.51.0(typescript@5.9.3)':
+  '@typescript-eslint/project-service@8.50.1(typescript@5.9.3)':
    dependencies:
-      '@typescript-eslint/tsconfig-utils': 8.51.0(typescript@5.9.3)
-      '@typescript-eslint/types': 8.51.0
+      '@typescript-eslint/tsconfig-utils': 8.50.1(typescript@5.9.3)
+      '@typescript-eslint/types': 8.50.1
      debug: 4.4.3
      typescript: 5.9.3
    transitivePeerDependencies:
      - supports-color

-  '@typescript-eslint/scope-manager@8.51.0':
+  '@typescript-eslint/scope-manager@8.50.1':
    dependencies:
-      '@typescript-eslint/types': 8.51.0
-      '@typescript-eslint/visitor-keys': 8.51.0
+      '@typescript-eslint/types': 8.50.1
+      '@typescript-eslint/visitor-keys': 8.50.1

-  '@typescript-eslint/tsconfig-utils@8.51.0(typescript@5.9.3)':
+  '@typescript-eslint/tsconfig-utils@8.50.1(typescript@5.9.3)':
    dependencies:
      typescript: 5.9.3

-  '@typescript-eslint/type-utils@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
+  '@typescript-eslint/type-utils@8.50.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
    dependencies:
-      '@typescript-eslint/types': 8.51.0
-      '@typescript-eslint/typescript-estree': 8.51.0(typescript@5.9.3)
-      '@typescript-eslint/utils': 8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/types': 8.50.1
+      '@typescript-eslint/typescript-estree': 8.50.1(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.50.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
      debug: 4.4.3
      eslint: 9.39.2(jiti@1.21.7)
-      ts-api-utils: 2.4.0(typescript@5.9.3)
+      ts-api-utils: 2.1.0(typescript@5.9.3)
      typescript: 5.9.3
    transitivePeerDependencies:
      - supports-color

-  '@typescript-eslint/types@8.51.0': {}
+  '@typescript-eslint/types@8.50.1': {}

-  '@typescript-eslint/typescript-estree@8.51.0(typescript@5.9.3)':
+  '@typescript-eslint/typescript-estree@8.50.1(typescript@5.9.3)':
    dependencies:
-      '@typescript-eslint/project-service': 8.51.0(typescript@5.9.3)
-      '@typescript-eslint/tsconfig-utils': 8.51.0(typescript@5.9.3)
-      '@typescript-eslint/types': 8.51.0
-      '@typescript-eslint/visitor-keys': 8.51.0
+      '@typescript-eslint/project-service': 8.50.1(typescript@5.9.3)
+      '@typescript-eslint/tsconfig-utils': 8.50.1(typescript@5.9.3)
+      '@typescript-eslint/types': 8.50.1
+      '@typescript-eslint/visitor-keys': 8.50.1
      debug: 4.4.3
      minimatch: 9.0.5
      semver: 7.7.3
      tinyglobby: 0.2.15
-      ts-api-utils: 2.4.0(typescript@5.9.3)
+      ts-api-utils: 2.1.0(typescript@5.9.3)
      typescript: 5.9.3
    transitivePeerDependencies:
      - supports-color

-  '@typescript-eslint/utils@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
+  '@typescript-eslint/utils@8.50.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
    dependencies:
-      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(jiti@1.21.7))
-      '@typescript-eslint/scope-manager': 8.51.0
-      '@typescript-eslint/types': 8.51.0
-      '@typescript-eslint/typescript-estree': 8.51.0(typescript@5.9.3)
+      '@eslint-community/eslint-utils': 4.9.0(eslint@9.39.2(jiti@1.21.7))
+      '@typescript-eslint/scope-manager': 8.50.1
+      '@typescript-eslint/types': 8.50.1
+      '@typescript-eslint/typescript-estree': 8.50.1(typescript@5.9.3)
      eslint: 9.39.2(jiti@1.21.7)
      typescript: 5.9.3
    transitivePeerDependencies:
      - supports-color

-  '@typescript-eslint/visitor-keys@8.51.0':
+  '@typescript-eslint/visitor-keys@8.50.1':
    dependencies:
-      '@typescript-eslint/types': 8.51.0
+      '@typescript-eslint/types': 8.50.1
      eslint-visitor-keys: 4.2.1

  '@xmldom/xmldom@0.9.8':
@@ -2567,7 +2564,7 @@ snapshots:
  autoprefixer@10.4.23(postcss@8.5.6):
    dependencies:
      browserslist: 4.28.1
-      caniuse-lite: 1.0.30001762
+      caniuse-lite: 1.0.30001761
      fraction.js: 5.3.4
      picocolors: 1.1.1
      postcss: 8.5.6
@@ -2605,7 +2602,7 @@ snapshots:
  browserslist@4.28.1:
    dependencies:
      baseline-browser-mapping: 2.9.11
-      caniuse-lite: 1.0.30001762
+      caniuse-lite: 1.0.30001761
      electron-to-chromium: 1.5.267
      node-releases: 2.0.27
      update-browserslist-db: 1.2.3(browserslist@4.28.1)
@@ -2634,7 +2631,7 @@ snapshots:

  camelcase-css@2.0.1: {}

-  caniuse-lite@1.0.30001762: {}
+  caniuse-lite@1.0.30001761: {}

  chalk@4.1.2:
    dependencies:
@@ -2798,7 +2795,7 @@ snapshots:

  eslint-plugin-svelte@3.13.1(eslint@9.39.2(jiti@1.21.7))(svelte@5.46.1):
    dependencies:
-      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(jiti@1.21.7))
+      '@eslint-community/eslint-utils': 4.9.0(eslint@9.39.2(jiti@1.21.7))
      '@jridgewell/sourcemap-codec': 1.5.5
      eslint: 9.39.2(jiti@1.21.7)
      esutils: 2.0.3
@@ -2831,7 +2828,7 @@ snapshots:

  eslint@9.39.2(jiti@1.21.7):
    dependencies:
-      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(jiti@1.21.7))
+      '@eslint-community/eslint-utils': 4.9.0(eslint@9.39.2(jiti@1.21.7))
      '@eslint-community/regexpp': 4.12.2
      '@eslint/config-array': 0.21.1
      '@eslint/config-helpers': 0.4.2
@@ -2851,7 +2848,7 @@ snapshots:
      eslint-scope: 8.4.0
      eslint-visitor-keys: 4.2.1
      espree: 10.4.0
-      esquery: 1.7.0
+      esquery: 1.6.0
      esutils: 2.0.3
      fast-deep-equal: 3.1.3
      file-entry-cache: 8.0.0
@@ -2878,7 +2875,7 @@ snapshots:
      acorn-jsx: 5.3.2(acorn@8.15.0)
      eslint-visitor-keys: 4.2.1

-  esquery@1.7.0:
+  esquery@1.6.0:
    dependencies:
      estraverse: 5.3.0

@@ -3604,7 +3601,7 @@ snapshots:

  totalist@3.0.1: {}

-  ts-api-utils@2.4.0(typescript@5.9.3):
+  ts-api-utils@2.1.0(typescript@5.9.3):
    dependencies:
      typescript: 5.9.3

@@ -3618,12 +3615,12 @@ snapshots:
    dependencies:
      prelude-ls: 1.2.1

-  typescript-eslint@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3):
+  typescript-eslint@8.50.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3):
    dependencies:
-      '@typescript-eslint/eslint-plugin': 8.51.0(@typescript-eslint/parser@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-      '@typescript-eslint/parser': 8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-      '@typescript-eslint/typescript-estree': 8.51.0(typescript@5.9.3)
-      '@typescript-eslint/utils': 8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/eslint-plugin': 8.50.1(@typescript-eslint/parser@8.50.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/parser': 8.50.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/typescript-estree': 8.50.1(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.50.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
      eslint: 9.39.2(jiti@1.21.7)
      typescript: 5.9.3
    transitivePeerDependencies:
@@ -3707,4 +3704,4 @@ snapshots:

  zimmerframe@1.1.4: {}

-  zod@4.3.4: {}
+  zod@4.2.1: {}
--- a/src/lib/components/atoms/RowVirtualizer.svelte
+++ b/src/lib/components/atoms/RowVirtualizer.svelte
@@ -1,60 +0,0 @@
-<script lang="ts">
-  import { createWindowVirtualizer } from "@tanstack/svelte-virtual";
-  import type { Snippet } from "svelte";
-  import type { ClassValue } from "svelte/elements";
-
-  interface Props {
-    class?: ClassValue;
-    count: number;
-    item: Snippet<[index: number]>;
-    itemHeight: (index: number) => number;
-    itemGap?: number;
-    placeholder?: Snippet;
-  }
-
-  let { class: className, count, item, itemHeight, itemGap, placeholder }: Props = $props();
-
-  let element: HTMLElement | undefined = $state();
-  let scrollMargin = $state(0);
-
-  let virtualizer = $derived(
-    createWindowVirtualizer({
-      count,
-      estimateSize: itemHeight,
-      gap: itemGap,
-      scrollMargin,
-    }),
-  );
-
-  const measureItem = (node: HTMLElement) => {
-    $effect(() => $virtualizer.measureElement(node));
-  };
-
-  $effect(() => {
-    if (!element) return;
-
-    const observer = new ResizeObserver(() => {
-      scrollMargin = Math.round(element!.getBoundingClientRect().top + window.scrollY);
-    });
-    observer.observe(element.parentElement!);
-    return () => observer.disconnect();
-  });
-</script>
-
-<div bind:this={element} class={["relative", className]}>
-  <div style:height="{$virtualizer.getTotalSize()}px">
-    {#each $virtualizer.getVirtualItems() as virtualItem (virtualItem.key)}
-      <div
-        class="absolute left-0 top-0 w-full"
-        style:transform="translateY({virtualItem.start - scrollMargin}px)"
-        data-index={virtualItem.index}
-        use:measureItem
-      >
-        {@render item(virtualItem.index)}
-      </div>
-    {/each}
-  </div>
-  {#if placeholder && $virtualizer.getVirtualItems().length === 0}
-    {@render placeholder()}
-  {/if}
-</div>
--- a/src/lib/components/atoms/buttons/FileThumbnailButton.svelte
+++ b/src/lib/components/atoms/buttons/FileThumbnailButton.svelte
@@ -1,34 +1,42 @@
 <script lang="ts">
-  import { browser } from "$app/environment";
-  import type { SummarizedFileInfo } from "$lib/modules/filesystem";
+  import type { Writable } from "svelte/store";
+  import type { FileInfo } from "$lib/modules/filesystem";
  import { requestFileThumbnailDownload } from "$lib/services/file";

  interface Props {
-    info: SummarizedFileInfo;
-    onclick?: (file: SummarizedFileInfo) => void;
+    info: Writable<FileInfo | null>;
+    onclick?: (file: FileInfo) => void;
  }

  let { info, onclick }: Props = $props();

-  let showThumbnail = $derived(
-    browser && (info.contentType.startsWith("image/") || info.contentType.startsWith("video/")),
-  );
-  let thumbnailPromise = $derived(
-    showThumbnail ? requestFileThumbnailDownload(info.id, info.dataKey?.key) : null,
-  );
+  let thumbnail: string | undefined = $state();
+
+  $effect(() => {
+    if ($info) {
+      requestFileThumbnailDownload($info.id, $info.dataKey)
+        .then((thumbnailUrl) => {
+          thumbnail = thumbnailUrl ?? undefined;
+        })
+        .catch(() => {
+          // TODO: Error Handling
+          thumbnail = undefined;
+        });
+    } else {
+      thumbnail = undefined;
+    }
+  });
 </script>

+{#if $info}
  <button
-  onclick={onclick && (() => setTimeout(() => onclick(info), 100))}
+    onclick={() => onclick?.($info)}
    class="aspect-square overflow-hidden rounded transition active:scale-95 active:brightness-90"
  >
-  {#await thumbnailPromise}
-    <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" />
+      <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>
+{/if}
--- a/src/lib/components/atoms/index.ts
+++ b/src/lib/components/atoms/index.ts
@@ -3,4 +3,3 @@ export * from "./buttons";
 export * from "./divs";
 export * from "./inputs";
 export { default as Modal } from "./Modal.svelte";
-export { default as RowVirtualizer } from "./RowVirtualizer.svelte";
--- a/src/lib/components/molecules/Categories.svelte
+++ b/src/lib/components/molecules/Categories.svelte
@@ -1,44 +0,0 @@
-<script module lang="ts">
-  import type { DataKey } from "$lib/modules/filesystem";
-
-  export interface SelectedCategory {
-    id: number;
-    dataKey?: DataKey;
-    name: string;
-  }
-</script>
-
-<script lang="ts">
-  import type { Component } from "svelte";
-  import type { SvelteHTMLElements } from "svelte/elements";
-  import { ActionEntryButton } from "$lib/components/atoms";
-  import { CategoryLabel } from "$lib/components/molecules";
-  import type { SubCategoryInfo } from "$lib/modules/filesystem";
-  import { sortEntries } from "$lib/utils";
-
-  interface Props {
-    categories: SubCategoryInfo[];
-    categoryMenuIcon?: Component<SvelteHTMLElements["svg"]>;
-    onCategoryClick: (category: SelectedCategory) => void;
-    onCategoryMenuClick?: (category: SelectedCategory) => void;
-  }
-
-  let { categories, categoryMenuIcon, onCategoryClick, onCategoryMenuClick }: Props = $props();
-
-  let categoriesWithName = $derived(sortEntries($state.snapshot(categories)));
-</script>
-
-{#if categoriesWithName.length > 0}
-  <div class="space-y-1">
-    {#each categoriesWithName as category (category.id)}
-      <ActionEntryButton
-        class="h-12"
-        onclick={() => onCategoryClick(category)}
-        actionButtonIcon={categoryMenuIcon}
-        onActionButtonClick={() => onCategoryMenuClick?.(category)}
-      >
-        <CategoryLabel name={category.name} />
-      </ActionEntryButton>
-    {/each}
-  </div>
-{/if}
--- a/src/lib/components/molecules/Categories/Categories.svelte
+++ b/src/lib/components/molecules/Categories/Categories.svelte
@@ -0,0 +1,63 @@
+<script lang="ts">
+  import { untrack, type Component } from "svelte";
+  import type { SvelteHTMLElements } from "svelte/elements";
+  import { get, type Writable } from "svelte/store";
+  import type { CategoryInfo } from "$lib/modules/filesystem";
+  import { SortBy, sortEntries } from "$lib/utils";
+  import Category from "./Category.svelte";
+  import type { SelectedCategory } from "./service";
+
+  interface Props {
+    categories: Writable<CategoryInfo | null>[];
+    categoryMenuIcon?: Component<SvelteHTMLElements["svg"]>;
+    onCategoryClick: (category: SelectedCategory) => void;
+    onCategoryMenuClick?: (category: SelectedCategory) => void;
+    sortBy?: SortBy;
+  }
+
+  let {
+    categories,
+    categoryMenuIcon,
+    onCategoryClick,
+    onCategoryMenuClick,
+    sortBy = SortBy.NAME_ASC,
+  }: Props = $props();
+
+  let categoriesWithName: { name?: string; info: Writable<CategoryInfo | null> }[] = $state([]);
+
+  $effect(() => {
+    categoriesWithName = categories.map((category) => ({
+      name: get(category)?.name,
+      info: category,
+    }));
+
+    const sort = () => {
+      sortEntries(categoriesWithName, sortBy);
+    };
+    return untrack(() => {
+      sort();
+
+      const unsubscribes = categoriesWithName.map((category) =>
+        category.info.subscribe((value) => {
+          if (category.name === value?.name) return;
+          category.name = value?.name;
+          sort();
+        }),
+      );
+      return () => unsubscribes.forEach((unsubscribe) => unsubscribe());
+    });
+  });
+</script>
+
+{#if categoriesWithName.length > 0}
+  <div class="space-y-1">
+    {#each categoriesWithName as { info }}
+      <Category
+        {info}
+        menuIcon={categoryMenuIcon}
+        onclick={onCategoryClick}
+        onMenuClick={onCategoryMenuClick}
+      />
+    {/each}
+  </div>
+{/if}
--- a/src/lib/components/molecules/Categories/Category.svelte
+++ b/src/lib/components/molecules/Categories/Category.svelte
@@ -0,0 +1,43 @@
+<script lang="ts">
+  import type { Component } from "svelte";
+  import type { SvelteHTMLElements } from "svelte/elements";
+  import type { Writable } from "svelte/store";
+  import { ActionEntryButton } from "$lib/components/atoms";
+  import { CategoryLabel } from "$lib/components/molecules";
+  import type { CategoryInfo } from "$lib/modules/filesystem";
+  import type { SelectedCategory } from "./service";
+
+  interface Props {
+    info: Writable<CategoryInfo | null>;
+    menuIcon?: Component<SvelteHTMLElements["svg"]>;
+    onclick: (category: SelectedCategory) => void;
+    onMenuClick?: (category: SelectedCategory) => void;
+  }
+
+  let { info, menuIcon, onclick, onMenuClick }: Props = $props();
+
+  const openCategory = () => {
+    const { id, dataKey, dataKeyVersion, name } = $info as CategoryInfo;
+    if (!dataKey || !dataKeyVersion) return; // TODO: Error handling
+
+    onclick({ id, dataKey, dataKeyVersion, name });
+  };
+
+  const openMenu = () => {
+    const { id, dataKey, dataKeyVersion, name } = $info as CategoryInfo;
+    if (!dataKey || !dataKeyVersion) return; // TODO: Error handling
+
+    onMenuClick!({ id, dataKey, dataKeyVersion, name });
+  };
+</script>
+
+{#if $info}
+  <ActionEntryButton
+    class="h-12"
+    onclick={openCategory}
+    actionButtonIcon={menuIcon}
+    onActionButtonClick={openMenu}
+  >
+    <CategoryLabel name={$info.name!} />
+  </ActionEntryButton>
+{/if}
--- a/src/lib/components/molecules/Categories/index.ts
+++ b/src/lib/components/molecules/Categories/index.ts
@@ -0,0 +1,2 @@
+export { default } from "./Categories.svelte";
+export * from "./service";
--- a/src/lib/components/molecules/Categories/service.ts
+++ b/src/lib/components/molecules/Categories/service.ts
@@ -0,0 +1,6 @@
+export interface SelectedCategory {
+  id: number;
+  dataKey: CryptoKey;
+  dataKeyVersion: Date;
+  name: string;
+}
--- a/src/lib/components/molecules/SubCategories.svelte
+++ b/src/lib/components/molecules/SubCategories.svelte
@@ -1,8 +1,10 @@
 <script lang="ts">
  import type { Component } from "svelte";
  import type { ClassValue, SvelteHTMLElements } from "svelte/elements";
+  import type { Writable } from "svelte/store";
  import { Categories, IconEntryButton, type SelectedCategory } from "$lib/components/molecules";
-  import type { CategoryInfo } from "$lib/modules/filesystem";
+  import { getCategoryInfo, type CategoryInfo } from "$lib/modules/filesystem";
+  import { masterKeyStore } from "$lib/stores";

  import IconAddCircle from "~icons/material-symbols/add-circle";

@@ -25,6 +27,14 @@
    subCategoryCreatePosition = "bottom",
    subCategoryMenuIcon,
  }: Props = $props();
+
+  let subCategories: Writable<CategoryInfo | null>[] = $state([]);
+
+  $effect(() => {
+    subCategories = info.subCategoryIds.map((id) =>
+      getCategoryInfo(id, $masterKeyStore?.get(1)?.key!),
+    );
+  });
 </script>

 <div class={["space-y-1", className]}>
@@ -43,12 +53,14 @@
  {#if subCategoryCreatePosition === "top"}
    {@render subCategoryCreate()}
  {/if}
+  {#key info}
    <Categories
-    categories={info.subCategories}
+      categories={subCategories}
      categoryMenuIcon={subCategoryMenuIcon}
      onCategoryClick={onSubCategoryClick}
      onCategoryMenuClick={onSubCategoryMenuClick}
    />
+  {/key}
  {#if subCategoryCreatePosition === "bottom"}
    {@render subCategoryCreate()}
  {/if}
--- a/src/lib/components/molecules/index.ts
+++ b/src/lib/components/molecules/index.ts
@@ -1,7 +1,7 @@
 export * from "./ActionModal.svelte";
 export { default as ActionModal } from "./ActionModal.svelte";
-export * from "./Categories.svelte";
-export { default as Categories } from "./Categories.svelte";
+export * from "./Categories";
+export { default as Categories } from "./Categories";
 export { default as IconEntryButton } from "./IconEntryButton.svelte";
 export * from "./labels";
 export { default as SubCategories } from "./SubCategories.svelte";
--- a/src/lib/components/organisms/Category/Category.svelte
+++ b/src/lib/components/organisms/Category/Category.svelte
@@ -1,9 +1,11 @@
 <script lang="ts">
-  import { CheckBox, RowVirtualizer } from "$lib/components/atoms";
+  import { untrack } from "svelte";
+  import { get, type Writable } from "svelte/store";
+  import { CheckBox } 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 { getFileInfo, type FileInfo, type CategoryInfo } from "$lib/modules/filesystem";
+  import { masterKeyStore } from "$lib/stores";
+  import { SortBy, sortEntries } from "$lib/utils";
  import File from "./File.svelte";
  import type { SelectedFile } from "./service";

@@ -11,12 +13,13 @@

  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;
+    sortBy?: SortBy;
+    isFileRecursive: boolean;
  }

  let {
@@ -26,31 +29,42 @@
    onSubCategoryClick,
    onSubCategoryCreateClick,
    onSubCategoryMenuClick,
+    sortBy = SortBy.NAME_ASC,
    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) ?? [],
-    ),
+  let files: { name?: string; info: Writable<FileInfo | null>; isRecursive: boolean }[] = $state(
+    [],
  );

  $effect(() => {
-    if (info.id === "root" || isFileRecursive === undefined) return;
-    if (lastCategoryId !== info.id) {
-      lastCategoryId = info.id;
-      lastIsFileRecursive = isFileRecursive;
-      return;
-    }
-    if (lastIsFileRecursive === isFileRecursive) return;
+    files =
+      info.files
+        ?.filter(({ isRecursive }) => isFileRecursive || !isRecursive)
+        .map(({ id, isRecursive }) => {
+          const info = getFileInfo(id, $masterKeyStore?.get(1)?.key!);
+          return {
+            name: get(info)?.name,
+            info,
+            isRecursive,
+          };
+        }) ?? [];

-    lastIsFileRecursive = isFileRecursive;
-    void updateCategoryInfo(info.id, { isFileRecursive });
+    const sort = () => {
+      sortEntries(files, sortBy);
+    };
+    return untrack(() => {
+      sort();
+
+      const unsubscribes = files.map((file) =>
+        file.info.subscribe((value) => {
+          if (file.name === value?.name) return;
+          file.name = value?.name;
+          sort();
+        }),
+      );
+      return () => unsubscribes.forEach((unsubscribe) => unsubscribe());
+    });
  });
 </script>

@@ -75,19 +89,19 @@
          <p class="font-medium">하위 카테고리의 파일</p>
        </CheckBox>
      </div>
-      <RowVirtualizer count={files.length} itemHeight={() => 48} itemGap={4}>
-        {#snippet item(index)}
-          {@const { details } = files[index]!}
+      <div class="space-y-1">
+        {#key info}
+          {#each files as { info, isRecursive }}
            <File
-            info={details}
+              {info}
              onclick={onFileClick}
-            onRemoveClick={!details.isRecursive ? onFileRemoveClick : undefined}
+              onRemoveClick={!isRecursive ? onFileRemoveClick : undefined}
            />
-        {/snippet}
-        {#snippet placeholder()}
-          <p class="text-center text-gray-500">이 카테고리에 추가된 파일이 없어요.</p>
-        {/snippet}
-      </RowVirtualizer>
+          {:else}
+            <p class="text-gray-500 text-center">이 카테고리에 추가된 파일이 없어요.</p>
+          {/each}
+        {/key}
+      </div>
    </div>
  {/if}
 </div>
--- a/src/lib/components/organisms/Category/File.svelte
+++ b/src/lib/components/organisms/Category/File.svelte
@@ -1,38 +1,59 @@
 <script lang="ts">
-  import { browser } from "$app/environment";
+  import type { Writable } from "svelte/store";
  import { ActionEntryButton } from "$lib/components/atoms";
  import { DirectoryEntryLabel } from "$lib/components/molecules";
-  import type { CategoryFileInfo } from "$lib/modules/filesystem";
-  import { requestFileThumbnailDownload } from "$lib/services/file";
-  import type { SelectedFile } from "./service";
+  import type { FileInfo } from "$lib/modules/filesystem";
+  import { requestFileThumbnailDownload, type SelectedFile } from "./service";

  import IconClose from "~icons/material-symbols/close";

  interface Props {
-    info: CategoryFileInfo;
-    onclick: (file: SelectedFile) => void;
-    onRemoveClick?: (file: SelectedFile) => void;
+    info: Writable<FileInfo | null>;
+    onclick: (selectedFile: SelectedFile) => void;
+    onRemoveClick?: (selectedFile: SelectedFile) => void;
  }

  let { info, onclick, onRemoveClick }: Props = $props();

-  let showThumbnail = $derived(
-    browser && (info.contentType.startsWith("image/") || info.contentType.startsWith("video/")),
-  );
-  let thumbnailPromise = $derived(
-    showThumbnail ? requestFileThumbnailDownload(info.id, info.dataKey?.key) : null,
-  );
+  let thumbnail: string | undefined = $state();
+
+  const openFile = () => {
+    const { id, dataKey, dataKeyVersion, name } = $info as FileInfo;
+    if (!dataKey || !dataKeyVersion) return; // TODO: Error handling
+
+    onclick({ id, dataKey, dataKeyVersion, name });
+  };
+
+  const removeFile = () => {
+    const { id, dataKey, dataKeyVersion, name } = $info as FileInfo;
+    if (!dataKey || !dataKeyVersion) return; // TODO: Error handling
+
+    onRemoveClick!({ id, dataKey, dataKeyVersion, name });
+  };
+
+  $effect(() => {
+    if ($info) {
+      requestFileThumbnailDownload($info.id, $info.dataKey)
+        .then((thumbnailUrl) => {
+          thumbnail = thumbnailUrl ?? undefined;
+        })
+        .catch(() => {
+          // TODO: Error Handling
+          thumbnail = undefined;
+        });
+    } else {
+      thumbnail = undefined;
+    }
+  });
 </script>

+{#if $info}
  <ActionEntryButton
    class="h-12"
-  onclick={() => onclick(info)}
+    onclick={openFile}
    actionButtonIcon={onRemoveClick && IconClose}
-  onActionButtonClick={() => onRemoveClick?.(info)}
+    onActionButtonClick={removeFile}
  >
-  {#await thumbnailPromise}
-    <DirectoryEntryLabel type="file" name={info.name} />
-  {:then thumbnail}
-    <DirectoryEntryLabel type="file" thumbnail={thumbnail ?? undefined} name={info.name} />
-  {/await}
+    <DirectoryEntryLabel type="file" {thumbnail} name={$info.name} />
  </ActionEntryButton>
+{/if}
--- a/src/lib/components/organisms/Category/service.ts
+++ b/src/lib/components/organisms/Category/service.ts
@@ -1,4 +1,8 @@
+export { requestFileThumbnailDownload } from "$lib/services/file";
+
 export interface SelectedFile {
  id: number;
+  dataKey: CryptoKey;
+  dataKeyVersion: Date;
  name: string;
 }
--- a/src/lib/components/organisms/Gallery.svelte
+++ b/src/lib/components/organisms/Gallery.svelte
@@ -1,78 +1,148 @@
 <script lang="ts">
-  import { FileThumbnailButton, RowVirtualizer } from "$lib/components/atoms";
-  import type { SummarizedFileInfo } from "$lib/modules/filesystem";
+  import { createWindowVirtualizer } from "@tanstack/svelte-virtual";
+  import { untrack } from "svelte";
+  import { get, type Writable } from "svelte/store";
+  import { FileThumbnailButton } from "$lib/components/atoms";
+  import type { FileInfo } from "$lib/modules/filesystem";
  import { formatDate, formatDateSortable, SortBy, sortEntries } from "$lib/utils";

  interface Props {
-    files: SummarizedFileInfo[];
-    onFileClick?: (file: SummarizedFileInfo) => void;
+    files: Writable<FileInfo | null>[];
+    onFileClick?: (file: FileInfo) => void;
  }

  let { files, onFileClick }: Props = $props();

+  type FileEntry =
+    | { date?: undefined; contentType?: undefined; info: Writable<FileInfo | null> }
+    | { date: Date; contentType: string; info: Writable<FileInfo | null> };
  type Row =
-    | { type: "header"; label: string }
-    | { type: "items"; files: SummarizedFileInfo[]; isLast: boolean };
+    | { type: "header"; key: string; label: string }
+    | { type: "items"; key: string; items: FileEntry[] };

-  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);
+  let filesWithDate: FileEntry[] = $state([]);
+  let rows: Row[] = $state([]);
+  let listElement: HTMLDivElement | undefined = $state();

-        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;
+  const virtualizer = createWindowVirtualizer({
+    count: 0,
+    getItemKey: (index) => rows[index]!.key,
+    estimateSize: () => 1000, // TODO
+  });
+
+  const measureRow = (node: HTMLElement) => {
+    $virtualizer.measureElement(node);
    return {
-              type: "items" as const,
-              files: sortedEntries.slice(start, end),
-              isLast: end >= sortedEntries.length,
+      update: () => $virtualizer.measureElement(node),
    };
+  };
+
+  $effect(() => {
+    filesWithDate = files.map((file) => {
+      const info = get(file);
+      if (info) {
+        return {
+          date: info.createdAt ?? info.lastModifiedAt,
+          contentType: info.contentType,
+          info: file,
+        };
+      } else {
+        return { info: file };
+      }
+    });
+
+    const buildRows = () => {
+      const map = new Map<string, FileEntry[]>();
+
+      for (const file of filesWithDate) {
+        if (
+          !file.date ||
+          !(file.contentType.startsWith("image/") || file.contentType.startsWith("video/"))
+        ) {
+          continue;
+        }
+
+        const date = formatDateSortable(file.date);
+        const entries = map.get(date) ?? [];
+        entries.push(file);
+        map.set(date, entries);
+      }
+
+      const newRows: Row[] = [];
+      const sortedDates = Array.from(map.keys()).sort((a, b) => b.localeCompare(a));
+      for (const date of sortedDates) {
+        const entries = map.get(date)!;
+        sortEntries(entries, SortBy.DATE_DESC);
+
+        newRows.push({
+          type: "header",
+          key: `header-${date}`,
+          label: formatDate(entries[0]!.date!),
+        });
+        newRows.push({
+          type: "items",
+          key: `items-${date}`,
+          items: entries,
+        });
+      }
+
+      rows = newRows;
+      $virtualizer.setOptions({ count: rows.length });
+    };
+    return untrack(() => {
+      buildRows();
+
+      const unsubscribes = filesWithDate.map((file) =>
+        file.info.subscribe((value) => {
+          const newDate = value?.createdAt ?? value?.lastModifiedAt;
+          const newContentType = value?.contentType;
+          if (file.date?.getTime() === newDate?.getTime() && file.contentType === newContentType) {
+            return;
+          }
+
+          file.date = newDate;
+          file.contentType = newContentType;
+          buildRows();
        }),
-        ] satisfies Row[];
+      );
+      return () => unsubscribes.forEach((unsubscribe) => unsubscribe());
    });
  });
 </script>

-<RowVirtualizer
-  count={rows.length}
-  itemHeight={(index) =>
-    rows[index]!.type === "header" ? 28 : 181 + (rows[index]!.isLast ? 16 : 4)}
-  class="flex flex-grow flex-col"
+<div bind:this={listElement} class="relative flex flex-grow flex-col">
+  <div style="height: {$virtualizer.getTotalSize()}px;">
+    {#each $virtualizer.getVirtualItems() as virtualRow (virtualRow.key)}
+      {@const row = rows[virtualRow.index]!}
+      <div
+        use:measureRow
+        data-index={virtualRow.index}
+        class="absolute left-0 top-0 w-full"
+        style="transform: translateY({virtualRow.start}px);"
      >
-  {#snippet item(index)}
-    {@const row = rows[index]!}
        {#if row.type === "header"}
-      <p class="pb-2 text-sm font-medium">{row.label}</p>
+          <p class="pb-2 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} />
+          <div class="grid grid-cols-4 gap-1 pb-4">
+            {#each row.items as { info }}
+              <FileThumbnailButton {info} onclick={onFileClick} />
            {/each}
          </div>
        {/if}
-  {/snippet}
-  {#snippet placeholder()}
+      </div>
+    {/each}
+  </div>
+  {#if $virtualizer.getVirtualItems().length === 0}
    <div class="flex h-full flex-grow items-center justify-center">
      <p class="text-gray-500">
        {#if files.length === 0}
          업로드된 파일이 없어요.
+        {:else if filesWithDate.length === 0}
+          파일 목록을 불러오고 있어요.
        {:else}
          사진 또는 동영상이 없어요.
        {/if}
      </p>
    </div>
-  {/snippet}
-</RowVirtualizer>
+  {/if}
+</div>
--- a/src/lib/indexedDB/filesystem.ts
+++ b/src/lib/indexedDB/filesystem.ts
@@ -1,5 +1,7 @@
 import { Dexie, type EntityTable } from "dexie";

+export type DirectoryId = "root" | number;
+
 interface DirectoryInfo {
  id: number;
  parentId: DirectoryId;
@@ -16,6 +18,8 @@ interface FileInfo {
  categoryIds: number[];
 }

+export type CategoryId = "root" | number;
+
 interface CategoryInfo {
  id: number;
  parentId: CategoryId;
@@ -62,16 +66,6 @@ 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();
 };
@@ -84,10 +78,6 @@ export const getFileInfo = async (id: number) => {
  return await filesystem.file.get(id);
 };

-export const bulkGetFileInfos = async (ids: number[]) => {
-  return await filesystem.file.bulkGet(ids);
-};
-
 export const storeFileInfo = async (fileInfo: FileInfo) => {
  await filesystem.file.put(fileInfo);
 };
@@ -96,13 +86,6 @@ export const deleteFileInfo = async (id: number) => {
  await filesystem.file.delete(id);
 };

-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();
 };
@@ -123,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[] = [];
--- a/src/lib/modules/file/download.svelte.ts
+++ b/src/lib/modules/file/download.svelte.ts
@@ -1,95 +0,0 @@
-import axios from "axios";
-import { limitFunction } from "p-limit";
-import { decryptData } from "$lib/modules/crypto";
-
-export interface FileDownloadState {
-  id: number;
-  status:
-    | "download-pending"
-    | "downloading"
-    | "decryption-pending"
-    | "decrypting"
-    | "decrypted"
-    | "canceled"
-    | "error";
-  progress?: number;
-  rate?: number;
-  estimated?: number;
-  result?: ArrayBuffer;
-}
-
-type LiveFileDownloadState = FileDownloadState & {
-  status: "download-pending" | "downloading" | "decryption-pending" | "decrypting";
-};
-
-let downloadingFiles: FileDownloadState[] = $state([]);
-
-export const isFileDownloading = (
-  status: FileDownloadState["status"],
-): status is LiveFileDownloadState["status"] =>
-  ["download-pending", "downloading", "decryption-pending", "decrypting"].includes(status);
-
-export const getFileDownloadState = (fileId: number) => {
-  return downloadingFiles.find((file) => file.id === fileId && isFileDownloading(file.status));
-};
-
-export const getDownloadingFiles = () => {
-  return downloadingFiles.filter((file) => isFileDownloading(file.status));
-};
-
-export const clearDownloadedFiles = () => {
-  downloadingFiles = downloadingFiles.filter((file) => isFileDownloading(file.status));
-};
-
-const requestFileDownload = limitFunction(
-  async (state: FileDownloadState, id: number) => {
-    state.status = "downloading";
-
-    const res = await axios.get(`/api/file/${id}/download`, {
-      responseType: "arraybuffer",
-      onDownloadProgress: ({ progress, rate, estimated }) => {
-        state.progress = progress;
-        state.rate = rate;
-        state.estimated = estimated;
-      },
-    });
-    const fileEncrypted: ArrayBuffer = res.data;
-
-    state.status = "decryption-pending";
-    return fileEncrypted;
-  },
-  { concurrency: 1 },
-);
-
-const decryptFile = limitFunction(
-  async (
-    state: FileDownloadState,
-    fileEncrypted: ArrayBuffer,
-    fileEncryptedIv: string,
-    dataKey: CryptoKey,
-  ) => {
-    state.status = "decrypting";
-
-    const fileBuffer = await decryptData(fileEncrypted, fileEncryptedIv, dataKey);
-
-    state.status = "decrypted";
-    state.result = fileBuffer;
-    return fileBuffer;
-  },
-  { concurrency: 4 },
-);
-
-export const downloadFile = async (id: number, fileEncryptedIv: string, dataKey: CryptoKey) => {
-  downloadingFiles.push({
-    id,
-    status: "download-pending",
-  });
-  const state = downloadingFiles.at(-1)!;
-
-  try {
-    return await decryptFile(state, await requestFileDownload(state, id), fileEncryptedIv, dataKey);
-  } catch (e) {
-    state.status = "error";
-    throw e;
-  }
-};
--- a/src/lib/modules/file/download.ts
+++ b/src/lib/modules/file/download.ts
@@ -0,0 +1,84 @@
+import axios from "axios";
+import { limitFunction } from "p-limit";
+import { writable, type Writable } from "svelte/store";
+import { decryptData } from "$lib/modules/crypto";
+import { fileDownloadStatusStore, type FileDownloadStatus } from "$lib/stores";
+
+const requestFileDownload = limitFunction(
+  async (status: Writable<FileDownloadStatus>, id: number) => {
+    status.update((value) => {
+      value.status = "downloading";
+      return value;
+    });
+
+    const res = await axios.get(`/api/file/${id}/download`, {
+      responseType: "arraybuffer",
+      onDownloadProgress: ({ progress, rate, estimated }) => {
+        status.update((value) => {
+          value.progress = progress;
+          value.rate = rate;
+          value.estimated = estimated;
+          return value;
+        });
+      },
+    });
+    const fileEncrypted: ArrayBuffer = res.data;
+
+    status.update((value) => {
+      value.status = "decryption-pending";
+      return value;
+    });
+    return fileEncrypted;
+  },
+  { concurrency: 1 },
+);
+
+const decryptFile = limitFunction(
+  async (
+    status: Writable<FileDownloadStatus>,
+    fileEncrypted: ArrayBuffer,
+    fileEncryptedIv: string,
+    dataKey: CryptoKey,
+  ) => {
+    status.update((value) => {
+      value.status = "decrypting";
+      return value;
+    });
+
+    const fileBuffer = await decryptData(fileEncrypted, fileEncryptedIv, dataKey);
+
+    status.update((value) => {
+      value.status = "decrypted";
+      value.result = fileBuffer;
+      return value;
+    });
+    return fileBuffer;
+  },
+  { concurrency: 4 },
+);
+
+export const downloadFile = async (id: number, fileEncryptedIv: string, dataKey: CryptoKey) => {
+  const status = writable<FileDownloadStatus>({
+    id,
+    status: "download-pending",
+  });
+  fileDownloadStatusStore.update((value) => {
+    value.push(status);
+    return value;
+  });
+
+  try {
+    return await decryptFile(
+      status,
+      await requestFileDownload(status, id),
+      fileEncryptedIv,
+      dataKey,
+    );
+  } catch (e) {
+    status.update((value) => {
+      value.status = "error";
+      return value;
+    });
+    throw e;
+  }
+};
--- a/src/lib/modules/file/index.ts
+++ b/src/lib/modules/file/index.ts
@@ -1,3 +1,3 @@
 export * from "./cache";
-export * from "./download.svelte";
-export * from "./upload.svelte";
+export * from "./download";
+export * from "./upload";
--- a/src/lib/modules/file/upload.svelte.ts
+++ b/src/lib/modules/file/upload.svelte.ts
@@ -1,6 +1,7 @@
 import axios from "axios";
 import ExifReader from "exifreader";
 import { limitFunction } from "p-limit";
+import { writable, type Writable } from "svelte/store";
 import {
  encodeToBase64,
  generateDataKey,
@@ -10,56 +11,20 @@ import {
  digestMessage,
  signMessageHmac,
 } from "$lib/modules/crypto";
-import { Scheduler } from "$lib/modules/scheduler";
 import { generateThumbnail } from "$lib/modules/thumbnail";
 import type {
  FileThumbnailUploadRequest,
  FileUploadRequest,
  FileUploadResponse,
 } from "$lib/server/schemas";
-import type { MasterKey, HmacSecret } from "$lib/stores";
+import {
+  fileUploadStatusStore,
+  type MasterKey,
+  type HmacSecret,
+  type FileUploadStatus,
+} from "$lib/stores";
 import { trpc } from "$trpc/client";

-export interface FileUploadState {
-  name: string;
-  parentId: DirectoryId;
-  status:
-    | "queued"
-    | "encryption-pending"
-    | "encrypting"
-    | "upload-pending"
-    | "uploading"
-    | "uploaded"
-    | "canceled"
-    | "error";
-  progress?: number;
-  rate?: number;
-  estimated?: number;
-}
-
-export type LiveFileUploadState = FileUploadState & {
-  status: "queued" | "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);
-
-export const getUploadingFiles = (parentId?: DirectoryId) => {
-  return uploadingFiles.filter(
-    (file) =>
-      (parentId === undefined || file.parentId === parentId) && isFileUploading(file.status),
-  );
-};
-
-export const clearUploadedFiles = () => {
-  uploadingFiles = uploadingFiles.filter((file) => isFileUploading(file.status));
-};
-
 const requestDuplicateFileScan = limitFunction(
  async (file: File, hmacSecret: HmacSecret, onDuplicate: () => Promise<boolean>) => {
    const fileBuffer = await file.arrayBuffer();
@@ -111,8 +76,16 @@ const extractExifDateTime = (fileBuffer: ArrayBuffer) => {
 };

 const encryptFile = limitFunction(
-  async (state: FileUploadState, file: File, fileBuffer: ArrayBuffer, masterKey: MasterKey) => {
-    state.status = "encrypting";
+  async (
+    status: Writable<FileUploadStatus>,
+    file: File,
+    fileBuffer: ArrayBuffer,
+    masterKey: MasterKey,
+  ) => {
+    status.update((value) => {
+      value.status = "encrypting";
+      return value;
+    });

    const fileType = getFileType(file);

@@ -136,7 +109,10 @@ const encryptFile = limitFunction(
    const thumbnailBuffer = await thumbnail?.arrayBuffer();
    const thumbnailEncrypted = thumbnailBuffer && (await encryptData(thumbnailBuffer, dataKey));

-    state.status = "upload-pending";
+    status.update((value) => {
+      value.status = "upload-pending";
+      return value;
+    });

    return {
      dataKeyWrapped,
@@ -154,14 +130,20 @@ const encryptFile = limitFunction(
 );

 const requestFileUpload = limitFunction(
-  async (state: FileUploadState, form: FormData, thumbnailForm: FormData | null) => {
-    state.status = "uploading";
+  async (status: Writable<FileUploadStatus>, form: FormData, thumbnailForm: FormData | null) => {
+    status.update((value) => {
+      value.status = "uploading";
+      return value;
+    });

    const res = await axios.post("/api/file/upload", form, {
      onUploadProgress: ({ progress, rate, estimated }) => {
-        state.progress = progress;
-        state.rate = rate;
-        state.estimated = estimated;
+        status.update((value) => {
+          value.progress = progress;
+          value.rate = rate;
+          value.estimated = estimated;
+          return value;
+        });
      },
    });
    const { file }: FileUploadResponse = res.data;
@@ -175,7 +157,10 @@ const requestFileUpload = limitFunction(
      }
    }

-    state.status = "uploaded";
+    status.update((value) => {
+      value.status = "uploaded";
+      return value;
+    });

    return { fileId: file };
  },
@@ -188,18 +173,18 @@ export const uploadFile = async (
  hmacSecret: HmacSecret,
  masterKey: MasterKey,
  onDuplicate: () => Promise<boolean>,
-) => {
-  uploadingFiles.push({
+): Promise<
+  { fileId: number; fileBuffer: ArrayBuffer; thumbnailBuffer?: ArrayBuffer } | undefined
+> => {
+  const status = writable<FileUploadStatus>({
    name: file.name,
    parentId,
-    status: "queued",
+    status: "encryption-pending",
+  });
+  fileUploadStatusStore.update((value) => {
+    value.push(status);
+    return value;
  });
-  const state = uploadingFiles.at(-1)!;
-
-  return await scheduler.schedule(
-    async () => file.size,
-    async () => {
-      state.status = "encryption-pending";

  try {
    const { fileBuffer, fileSigned } = await requestDuplicateFileScan(
@@ -208,8 +193,14 @@ export const uploadFile = async (
      onDuplicate,
    );
    if (!fileBuffer || !fileSigned) {
-          state.status = "canceled";
-          uploadingFiles = uploadingFiles.filter((file) => file !== state);
+      status.update((value) => {
+        value.status = "canceled";
+        return value;
+      });
+      fileUploadStatusStore.update((value) => {
+        value = value.filter((v) => v !== status);
+        return value;
+      });
      return undefined;
    }

@@ -223,7 +214,7 @@ export const uploadFile = async (
      createdAtEncrypted,
      lastModifiedAtEncrypted,
      thumbnail,
-        } = await encryptFile(state, file, fileBuffer, masterKey);
+    } = await encryptFile(status, file, fileBuffer, masterKey);

    const form = new FormData();
    form.set(
@@ -261,12 +252,13 @@ export const uploadFile = async (
      thumbnailForm.set("content", new Blob([thumbnail.ciphertext]));
    }

-        const { fileId } = await requestFileUpload(state, form, thumbnailForm);
+    const { fileId } = await requestFileUpload(status, form, thumbnailForm);
    return { fileId, fileBuffer, thumbnailBuffer: thumbnail?.plaintext };
  } catch (e) {
-        state.status = "error";
+    status.update((value) => {
+      value.status = "error";
+      return value;
+    });
    throw e;
  }
-    },
-  );
 };
--- a/src/lib/modules/filesystem.ts
+++ b/src/lib/modules/filesystem.ts
@@ -0,0 +1,370 @@
+import { TRPCClientError } from "@trpc/client";
+import { get, writable, type Writable } from "svelte/store";
+import {
+  getDirectoryInfos as getDirectoryInfosFromIndexedDB,
+  getDirectoryInfo as getDirectoryInfoFromIndexedDB,
+  storeDirectoryInfo,
+  deleteDirectoryInfo,
+  getFileInfos as getFileInfosFromIndexedDB,
+  getFileInfo as getFileInfoFromIndexedDB,
+  storeFileInfo,
+  deleteFileInfo,
+  getCategoryInfos as getCategoryInfosFromIndexedDB,
+  getCategoryInfo as getCategoryInfoFromIndexedDB,
+  storeCategoryInfo,
+  updateCategoryInfo as updateCategoryInfoInIndexedDB,
+  deleteCategoryInfo,
+  type DirectoryId,
+  type CategoryId,
+} from "$lib/indexedDB";
+import { unwrapDataKey, decryptString } from "$lib/modules/crypto";
+import { trpc } from "$trpc/client";
+
+export type DirectoryInfo =
+  | {
+      id: "root";
+      parentId?: undefined;
+      dataKey?: undefined;
+      dataKeyVersion?: undefined;
+      name?: undefined;
+      subDirectoryIds: number[];
+      fileIds: number[];
+    }
+  | {
+      id: number;
+      parentId: DirectoryId;
+      dataKey?: CryptoKey;
+      dataKeyVersion?: Date;
+      name: string;
+      subDirectoryIds: number[];
+      fileIds: number[];
+    };
+
+export interface FileInfo {
+  id: number;
+  parentId: DirectoryId;
+  dataKey?: CryptoKey;
+  dataKeyVersion?: Date;
+  contentType: string;
+  contentIv?: string;
+  name: string;
+  createdAt?: Date;
+  lastModifiedAt: Date;
+  categoryIds: number[];
+}
+
+export type CategoryInfo =
+  | {
+      id: "root";
+      dataKey?: undefined;
+      dataKeyVersion?: undefined;
+      name?: undefined;
+      subCategoryIds: number[];
+      files?: undefined;
+      isFileRecursive?: undefined;
+    }
+  | {
+      id: number;
+      dataKey?: CryptoKey;
+      dataKeyVersion?: Date;
+      name: string;
+      subCategoryIds: number[];
+      files: { id: number; isRecursive: boolean }[];
+      isFileRecursive: boolean;
+    };
+
+const directoryInfoStore = new Map<DirectoryId, Writable<DirectoryInfo | null>>();
+const fileInfoStore = new Map<number, Writable<FileInfo | null>>();
+const categoryInfoStore = new Map<CategoryId, Writable<CategoryInfo | null>>();
+
+const fetchDirectoryInfoFromIndexedDB = async (
+  id: DirectoryId,
+  info: Writable<DirectoryInfo | null>,
+) => {
+  if (get(info)) return;
+
+  const [directory, subDirectories, files] = await Promise.all([
+    id !== "root" ? getDirectoryInfoFromIndexedDB(id) : undefined,
+    getDirectoryInfosFromIndexedDB(id),
+    getFileInfosFromIndexedDB(id),
+  ]);
+  const subDirectoryIds = subDirectories.map(({ id }) => id);
+  const fileIds = files.map(({ id }) => id);
+
+  if (id === "root") {
+    info.set({ id, subDirectoryIds, fileIds });
+  } else {
+    if (!directory) return;
+    info.set({
+      id,
+      parentId: directory.parentId,
+      name: directory.name,
+      subDirectoryIds,
+      fileIds,
+    });
+  }
+};
+
+const fetchDirectoryInfoFromServer = async (
+  id: DirectoryId,
+  info: Writable<DirectoryInfo | null>,
+  masterKey: CryptoKey,
+) => {
+  let data;
+  try {
+    data = await trpc().directory.get.query({ id });
+  } catch (e) {
+    if (e instanceof TRPCClientError && e.data?.code === "NOT_FOUND") {
+      info.set(null);
+      await deleteDirectoryInfo(id as number);
+      return;
+    }
+    throw new Error("Failed to fetch directory information");
+  }
+
+  const { metadata, subDirectories: subDirectoryIds, files: fileIds } = data;
+
+  if (id === "root") {
+    info.set({ id, subDirectoryIds, fileIds });
+  } else {
+    const { dataKey } = await unwrapDataKey(metadata!.dek, masterKey);
+    const name = await decryptString(metadata!.name, metadata!.nameIv, dataKey);
+
+    info.set({
+      id,
+      parentId: metadata!.parent,
+      dataKey,
+      dataKeyVersion: new Date(metadata!.dekVersion),
+      name,
+      subDirectoryIds,
+      fileIds,
+    });
+    await storeDirectoryInfo({ id, parentId: metadata!.parent, name });
+  }
+};
+
+const fetchDirectoryInfo = async (
+  id: DirectoryId,
+  info: Writable<DirectoryInfo | null>,
+  masterKey: CryptoKey,
+) => {
+  await fetchDirectoryInfoFromIndexedDB(id, info);
+  await fetchDirectoryInfoFromServer(id, info, masterKey);
+};
+
+export const getDirectoryInfo = (id: DirectoryId, masterKey: CryptoKey) => {
+  // TODO: MEK rotation
+
+  let info = directoryInfoStore.get(id);
+  if (!info) {
+    info = writable(null);
+    directoryInfoStore.set(id, info);
+  }
+
+  fetchDirectoryInfo(id, info, masterKey); // Intended
+  return info;
+};
+
+const fetchFileInfoFromIndexedDB = async (id: number, info: Writable<FileInfo | null>) => {
+  if (get(info)) return;
+
+  const file = await getFileInfoFromIndexedDB(id);
+  if (!file) return;
+
+  info.set(file);
+};
+
+const decryptDate = async (ciphertext: string, iv: string, dataKey: CryptoKey) => {
+  return new Date(parseInt(await decryptString(ciphertext, iv, dataKey), 10));
+};
+
+const fetchFileInfoFromServer = async (
+  id: number,
+  info: Writable<FileInfo | null>,
+  masterKey: CryptoKey,
+) => {
+  let metadata;
+  try {
+    metadata = await trpc().file.get.query({ id });
+  } catch (e) {
+    if (e instanceof TRPCClientError && e.data?.code === "NOT_FOUND") {
+      info.set(null);
+      await deleteFileInfo(id);
+      return;
+    }
+    throw new Error("Failed to fetch file information");
+  }
+  const { dataKey } = await unwrapDataKey(metadata.dek, masterKey);
+
+  const name = await decryptString(metadata.name, metadata.nameIv, dataKey);
+  const createdAt =
+    metadata.createdAt && metadata.createdAtIv
+      ? await decryptDate(metadata.createdAt, metadata.createdAtIv, dataKey)
+      : undefined;
+  const lastModifiedAt = await decryptDate(
+    metadata.lastModifiedAt,
+    metadata.lastModifiedAtIv,
+    dataKey,
+  );
+
+  info.set({
+    id,
+    parentId: metadata.parent,
+    dataKey,
+    dataKeyVersion: new Date(metadata.dekVersion),
+    contentType: metadata.contentType,
+    contentIv: metadata.contentIv,
+    name,
+    createdAt,
+    lastModifiedAt,
+    categoryIds: metadata.categories,
+  });
+  await storeFileInfo({
+    id,
+    parentId: metadata.parent,
+    name,
+    contentType: metadata.contentType,
+    createdAt,
+    lastModifiedAt,
+    categoryIds: metadata.categories,
+  });
+};
+
+const fetchFileInfo = async (id: number, info: Writable<FileInfo | null>, masterKey: CryptoKey) => {
+  await fetchFileInfoFromIndexedDB(id, info);
+  await fetchFileInfoFromServer(id, info, masterKey);
+};
+
+export const getFileInfo = (fileId: number, masterKey: CryptoKey) => {
+  // TODO: MEK rotation
+
+  let info = fileInfoStore.get(fileId);
+  if (!info) {
+    info = writable(null);
+    fileInfoStore.set(fileId, info);
+  }
+
+  fetchFileInfo(fileId, info, masterKey); // Intended
+  return info;
+};
+
+const fetchCategoryInfoFromIndexedDB = async (
+  id: CategoryId,
+  info: Writable<CategoryInfo | null>,
+) => {
+  if (get(info)) return;
+
+  const [category, subCategories] = await Promise.all([
+    id !== "root" ? getCategoryInfoFromIndexedDB(id) : undefined,
+    getCategoryInfosFromIndexedDB(id),
+  ]);
+  const subCategoryIds = subCategories.map(({ id }) => id);
+
+  if (id === "root") {
+    info.set({ id, subCategoryIds });
+  } else {
+    if (!category) return;
+    info.set({
+      id,
+      name: category.name,
+      subCategoryIds,
+      files: category.files,
+      isFileRecursive: category.isFileRecursive,
+    });
+  }
+};
+
+const fetchCategoryInfoFromServer = async (
+  id: CategoryId,
+  info: Writable<CategoryInfo | null>,
+  masterKey: CryptoKey,
+) => {
+  let data;
+  try {
+    data = await trpc().category.get.query({ id });
+  } catch (e) {
+    if (e instanceof TRPCClientError && e.data?.code === "NOT_FOUND") {
+      info.set(null);
+      await deleteCategoryInfo(id as number);
+      return;
+    }
+    throw new Error("Failed to fetch category information");
+  }
+
+  const { metadata, subCategories } = data;
+
+  if (id === "root") {
+    info.set({ id, subCategoryIds: subCategories });
+  } else {
+    const { dataKey } = await unwrapDataKey(metadata!.dek, masterKey);
+    const name = await decryptString(metadata!.name, metadata!.nameIv, dataKey);
+
+    let files;
+    try {
+      files = await trpc().category.files.query({ id, recurse: true });
+    } catch {
+      throw new Error("Failed to fetch category files");
+    }
+
+    const filesMapped = files.map(({ file, isRecursive }) => ({ id: file, isRecursive }));
+    let isFileRecursive: boolean | undefined = undefined;
+
+    info.update((value) => {
+      const newValue = {
+        isFileRecursive: false,
+        ...value,
+        id,
+        dataKey,
+        dataKeyVersion: new Date(metadata!.dekVersion),
+        name,
+        subCategoryIds: subCategories,
+        files: filesMapped,
+      };
+      isFileRecursive = newValue.isFileRecursive;
+      return newValue;
+    });
+    await storeCategoryInfo({
+      id,
+      parentId: metadata!.parent,
+      name,
+      files: filesMapped,
+      isFileRecursive: isFileRecursive!,
+    });
+  }
+};
+
+const fetchCategoryInfo = async (
+  id: CategoryId,
+  info: Writable<CategoryInfo | null>,
+  masterKey: CryptoKey,
+) => {
+  await fetchCategoryInfoFromIndexedDB(id, info);
+  await fetchCategoryInfoFromServer(id, info, masterKey);
+};
+
+export const getCategoryInfo = (categoryId: CategoryId, masterKey: CryptoKey) => {
+  // TODO: MEK rotation
+
+  let info = categoryInfoStore.get(categoryId);
+  if (!info) {
+    info = writable(null);
+    categoryInfoStore.set(categoryId, info);
+  }
+
+  fetchCategoryInfo(categoryId, info, masterKey); // Intended
+  return info;
+};
+
+export const updateCategoryInfo = async (
+  categoryId: number,
+  changes: { isFileRecursive?: boolean },
+) => {
+  await updateCategoryInfoInIndexedDB(categoryId, changes);
+  categoryInfoStore.get(categoryId)?.update((value) => {
+    if (!value) return value;
+    if (changes.isFileRecursive !== undefined) {
+      value.isFileRecursive = changes.isFileRecursive;
+    }
+    return value;
+  });
+};
--- a/src/lib/modules/filesystem/category.ts
+++ b/src/lib/modules/filesystem/category.ts
@@ -1,167 +0,0 @@
-import * as IndexedDB from "$lib/indexedDB";
-import { trpc, isTRPCClientError } from "$trpc/client";
-import { FilesystemCache, decryptFileMetadata, decryptCategoryMetadata } from "./internal.svelte";
-import type { MaybeCategoryInfo } from "./types";
-
-const cache = new FilesystemCache<CategoryId, MaybeCategoryInfo, Partial<MaybeCategoryInfo>>();
-
-const fetchFromIndexedDB = async (id: CategoryId) => {
-  const [category, subCategories] = await Promise.all([
-    id !== "root" ? IndexedDB.getCategoryInfo(id) : undefined,
-    IndexedDB.getCategoryInfos(id),
-  ]);
-  const files = category
-    ? await Promise.all(
-        category.files.map(async (file) => {
-          const fileInfo = await IndexedDB.getFileInfo(file.id);
-          return fileInfo
-            ? {
-                id: file.id,
-                contentType: fileInfo.contentType,
-                name: fileInfo.name,
-                createdAt: fileInfo.createdAt,
-                lastModifiedAt: fileInfo.lastModifiedAt,
-                isRecursive: file.isRecursive,
-              }
-            : undefined;
-        }),
-      )
-    : undefined;
-
-  if (id === "root") {
-    return {
-      id,
-      exists: true as const,
-      subCategories,
-    };
-  } else if (category) {
-    return {
-      id,
-      exists: true as const,
-      name: category.name,
-      subCategories,
-      files: files!.filter((file) => !!file),
-      isFileRecursive: category.isFileRecursive,
-    };
-  }
-};
-
-const fetchFromServer = async (id: CategoryId, masterKey: CryptoKey) => {
-  try {
-    const {
-      metadata,
-      subCategories: subCategoriesRaw,
-      files: filesRaw,
-    } = await trpc().category.get.query({ id, recurse: true });
-
-    void IndexedDB.deleteDanglingCategoryInfos(id, new Set(subCategoriesRaw.map(({ id }) => id)));
-
-    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,
-          name: decrypted.name,
-          files: existing?.files ?? [],
-          isFileRecursive: existing?.isFileRecursive ?? false,
-        });
-        return {
-          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,
-              contentType: file.contentType,
-              isRecursive: file.isRecursive,
-              ...decrypted,
-            };
-          }),
-        )
-      : undefined;
-
-    const decryptedMetadata = metadata
-      ? await decryptCategoryMetadata(metadata, masterKey)
-      : undefined;
-    if (id !== "root" && metadata && decryptedMetadata) {
-      const existingCategory = await IndexedDB.getCategoryInfo(id);
-      await IndexedDB.storeCategoryInfo({
-        id: id as number,
-        parentId: metadata.parent,
-        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!,
-      };
-    }
-  } catch (e) {
-    if (isTRPCClientError(e) && e.data?.code === "NOT_FOUND") {
-      await IndexedDB.deleteCategoryInfo(id as number);
-      return { id, exists: false as const };
-    }
-    throw e;
-  }
-};
-
-export const getCategoryInfo = async (id: CategoryId, masterKey: CryptoKey) => {
-  return await cache.get(id, async (isInitial, resolve) => {
-    if (isInitial) {
-      const info = await fetchFromIndexedDB(id);
-      if (info) {
-        resolve(info);
-      }
-    }
-
-    const info = await fetchFromServer(id, masterKey);
-    if (info) {
-      resolve(info);
-    }
-  });
-};
--- a/src/lib/modules/filesystem/directory.ts
+++ b/src/lib/modules/filesystem/directory.ts
@@ -1,125 +0,0 @@
-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 { MaybeDirectoryInfo } from "./types";
-
-const cache = new FilesystemCache<DirectoryId, MaybeDirectoryInfo>();
-
-const fetchFromIndexedDB = async (id: DirectoryId) => {
-  const [directory, subDirectories, files] = await Promise.all([
-    id !== "root" ? IndexedDB.getDirectoryInfo(id) : undefined,
-    IndexedDB.getDirectoryInfos(id),
-    IndexedDB.getFileInfos(id),
-  ]);
-
-  if (id === "root") {
-    return {
-      id,
-      exists: true as const,
-      subDirectories,
-      files,
-    };
-  } else if (directory) {
-    return {
-      id,
-      exists: true as const,
-      parentId: directory.parentId,
-      name: directory.name,
-      subDirectories,
-      files,
-    };
-  }
-};
-
-const fetchFromServer = async (id: DirectoryId, masterKey: CryptoKey) => {
-  try {
-    const {
-      metadata,
-      subDirectories: subDirectoriesRaw,
-      files: filesRaw,
-    } = await trpc().directory.get.query({ id });
-
-    void IndexedDB.deleteDanglingDirectoryInfos(id, new Set(subDirectoriesRaw.map(({ id }) => id)));
-    void IndexedDB.deleteDanglingFileInfos(id, new Set(filesRaw.map(({ id }) => id)));
-
-    const existingFiles = await IndexedDB.bulkGetFileInfos(filesRaw.map((file) => file.id));
-    const [subDirectories, files, decryptedMetadata] = await Promise.all([
-      Promise.all(
-        subDirectoriesRaw.map(async (directory) => {
-          const decrypted = await decryptDirectoryMetadata(directory, masterKey);
-          await IndexedDB.storeDirectoryInfo({
-            id: directory.id,
-            parentId: id,
-            name: decrypted.name,
-          });
-          return {
-            id: directory.id,
-            ...decrypted,
-          };
-        }),
-      ),
-      Promise.all(
-        filesRaw.map(async (file, index) => {
-          const decrypted = await decryptFileMetadata(file, masterKey);
-          await IndexedDB.storeFileInfo({
-            id: file.id,
-            parentId: id,
-            contentType: file.contentType,
-            name: decrypted.name,
-            createdAt: decrypted.createdAt,
-            lastModifiedAt: decrypted.lastModifiedAt,
-            categoryIds: existingFiles[index]?.categoryIds ?? [],
-          });
-          return {
-            id: file.id,
-            contentType: file.contentType,
-            ...decrypted,
-          };
-        }),
-      ),
-      metadata ? decryptDirectoryMetadata(metadata, masterKey) : undefined,
-    ]);
-
-    if (id !== "root" && metadata && decryptedMetadata) {
-      await IndexedDB.storeDirectoryInfo({
-        id,
-        parentId: metadata.parent,
-        name: decryptedMetadata.name,
-      });
-    }
-
-    if (id === "root") {
-      return {
-        id,
-        exists: true as const,
-        subDirectories,
-        files,
-      };
-    } else {
-      return {
-        id,
-        exists: true as const,
-        parentId: metadata!.parent,
-        subDirectories,
-        files,
-        ...decryptedMetadata!,
-      };
-    }
-  } catch (e) {
-    if (isTRPCClientError(e) && e.data?.code === "NOT_FOUND") {
-      await IndexedDB.deleteDirectoryInfo(id as number);
-      return { id, exists: false as const };
-    }
-    throw e;
-  }
-};
-
-export const getDirectoryInfo = async (id: DirectoryId, masterKey: CryptoKey) => {
-  return await cache.get(id, (isInitial, resolve) =>
-    monotonicResolve(
-      [isInitial && fetchFromIndexedDB(id), fetchFromServer(id, masterKey)],
-      resolve,
-    ),
-  );
-};
--- a/src/lib/modules/filesystem/file.ts
+++ b/src/lib/modules/filesystem/file.ts
@@ -1,175 +0,0 @@
-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 { MaybeFileInfo } from "./types";
-
-const cache = new FilesystemCache<number, MaybeFileInfo>();
-
-const fetchFromIndexedDB = async (id: number) => {
-  const file = await IndexedDB.getFileInfo(id);
-  const categories = 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;
-
-  if (file) {
-    return {
-      id,
-      exists: true as const,
-      parentId: file.parentId,
-      contentType: file.contentType,
-      name: file.name,
-      createdAt: file.createdAt,
-      lastModifiedAt: file.lastModifiedAt,
-      categories: categories!.filter((category) => !!category),
-    };
-  }
-};
-
-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 { categories: categoriesRaw, ...metadata } = await trpc().file.get.query({ id });
-    const [categories, decryptedMetadata] = await Promise.all([
-      Promise.all(
-        categoriesRaw.map(async (category) => ({
-          id: category.id,
-          ...(await decryptCategoryMetadata(category, masterKey)),
-        })),
-      ),
-      decryptFileMetadata(metadata, masterKey),
-    ]);
-
-    await IndexedDB.storeFileInfo({
-      id,
-      parentId: metadata.parent,
-      contentType: metadata.contentType,
-      name: decryptedMetadata.name,
-      createdAt: decryptedMetadata.createdAt,
-      lastModifiedAt: decryptedMetadata.lastModifiedAt,
-      categoryIds: categories.map((category) => category.id),
-    });
-
-    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);
-      return { id, exists: false as const };
-    }
-    throw e;
-  }
-};
-
-const bulkFetchFromServer = async (ids: number[], masterKey: CryptoKey) => {
-  const filesRaw = await trpc().file.bulkGet.query({ ids });
-  const files = await Promise.all(
-    filesRaw.map(async (file) => {
-      const [categories, decryptedMetadata] = await Promise.all([
-        Promise.all(
-          file.categories.map(async (category) => ({
-            id: category.id,
-            ...(await decryptCategoryMetadata(category, 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: file.id,
-        exists: true as const,
-        parentId: file.parent,
-        contentType: file.contentType,
-        contentIv: file.contentIv,
-        categories,
-        ...decryptedMetadata,
-      };
-    }),
-  );
-
-  const existingIds = new Set(filesRaw.map(({ id }) => id));
-  return new Map<number, MaybeFileInfo>([
-    ...files.map((file) => [file.id, file] as const),
-    ...ids.filter((id) => !existingIds.has(id)).map((id) => [id, { id, exists: false }] as const),
-  ]);
-};
-
-export const getFileInfo = async (id: number, masterKey: CryptoKey) => {
-  return await cache.get(id, (isInitial, resolve) =>
-    monotonicResolve(
-      [isInitial && fetchFromIndexedDB(id), fetchFromServer(id, masterKey)],
-      resolve,
-    ),
-  );
-};
-
-export const bulkGetFileInfo = async (ids: number[], masterKey: CryptoKey) => {
-  return await cache.bulkGet(new Set(ids), (keys, resolve) =>
-    monotonicResolve(
-      [
-        bulkFetchFromIndexedDB(
-          Array.from(
-            keys
-              .entries()
-              .filter(([, isInitial]) => isInitial)
-              .map(([key]) => key),
-          ),
-        ),
-        bulkFetchFromServer(Array.from(keys.keys()), masterKey),
-      ],
-      resolve,
-    ),
-  );
-};
--- a/src/lib/modules/filesystem/index.ts
+++ b/src/lib/modules/filesystem/index.ts
@@ -1,4 +0,0 @@
-export * from "./category";
-export * from "./directory";
-export * from "./file";
-export * from "./types";
--- a/src/lib/modules/filesystem/internal.svelte.ts
+++ b/src/lib/modules/filesystem/internal.svelte.ts
@@ -1,130 +0,0 @@
-import { unwrapDataKey, decryptString } from "$lib/modules/crypto";
-
-export class FilesystemCache<K, V extends RV, RV = V> {
-  private map = new Map<K, V | Promise<V>>();
-
-  get(key: K, loader: (isInitial: boolean, resolve: (value: RV | undefined) => void) => void) {
-    const info = this.map.get(key);
-    if (info instanceof Promise) {
-      return info;
-    }
-
-    const { promise, resolve } = Promise.withResolvers<V>();
-    if (!info) {
-      this.map.set(key, promise);
-    }
-
-    loader(!info, (loadedInfo) => {
-      if (!loadedInfo) return;
-
-      const info = this.map.get(key)!;
-      if (info instanceof Promise) {
-        const state = $state(loadedInfo);
-        this.map.set(key, state as V);
-        resolve(state as V);
-      } else {
-        Object.assign(info, loadedInfo);
-        resolve(info);
-      }
-    });
-
-    return info ?? promise;
-  }
-
-  async bulkGet(
-    keys: Set<K>,
-    loader: (keys: Map<K, boolean>, resolve: (values: Map<K, RV>) => void) => void,
-  ) {
-    const states = new Map<K, V>();
-    const promises = new Map<K, Promise<V>>();
-    const resolvers = new Map<K, (value: V) => void>();
-
-    keys.forEach((key) => {
-      const info = this.map.get(key);
-      if (info instanceof Promise) {
-        promises.set(key, info);
-      } else if (info) {
-        states.set(key, info);
-      } else {
-        const { promise, resolve } = Promise.withResolvers<V>();
-        this.map.set(key, promise);
-        promises.set(key, promise);
-        resolvers.set(key, resolve);
-      }
-    });
-
-    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 info = this.map.get(key)!;
-          const resolve = resolvers.get(key);
-          if (info instanceof Promise) {
-            const state = $state(loadedInfo);
-            this.map.set(key, state as V);
-            resolve?.(state as V);
-          } else {
-            Object.assign(info, loadedInfo);
-            resolve?.(info);
-          }
-        }),
-    );
-
-    const newStates = await Promise.all(
-      promises.entries().map(async ([key, promise]) => [key, await promise] as const),
-    );
-    return new Map([...states, ...newStates]);
-  }
-}
-
-export const decryptDirectoryMetadata = async (
-  metadata: { dek: string; dekVersion: Date; name: string; nameIv: string },
-  masterKey: CryptoKey,
-) => {
-  const { dataKey } = await unwrapDataKey(metadata.dek, masterKey);
-  const name = await decryptString(metadata.name, metadata.nameIv, dataKey);
-
-  return {
-    dataKey: { key: dataKey, version: metadata.dekVersion },
-    name,
-  };
-};
-
-const decryptDate = async (ciphertext: string, iv: string, dataKey: CryptoKey) => {
-  return new Date(parseInt(await decryptString(ciphertext, iv, dataKey), 10));
-};
-
-export const decryptFileMetadata = async (
-  metadata: {
-    dek: string;
-    dekVersion: Date;
-    name: string;
-    nameIv: string;
-    createdAt?: string;
-    createdAtIv?: string;
-    lastModifiedAt: string;
-    lastModifiedAtIv: string;
-  },
-  masterKey: CryptoKey,
-) => {
-  const { dataKey } = await unwrapDataKey(metadata.dek, masterKey);
-  const [name, createdAt, lastModifiedAt] = await Promise.all([
-    decryptString(metadata.name, metadata.nameIv, dataKey),
-    metadata.createdAt
-      ? decryptDate(metadata.createdAt, metadata.createdAtIv!, dataKey)
-      : undefined,
-    decryptDate(metadata.lastModifiedAt, metadata.lastModifiedAtIv, dataKey),
-  ]);
-
-  return {
-    dataKey: { key: dataKey, version: metadata.dekVersion },
-    name,
-    createdAt,
-    lastModifiedAt,
-  };
-};
-
-export const decryptCategoryMetadata = decryptDirectoryMetadata;
--- a/src/lib/modules/filesystem/types.ts
+++ b/src/lib/modules/filesystem/types.ts
@@ -1,71 +0,0 @@
-export type DataKey = { key: CryptoKey; version: Date };
-type AllUndefined<T> = { [K in keyof T]?: undefined };
-
-interface LocalDirectoryInfo {
-  id: number;
-  parentId: DirectoryId;
-  dataKey?: DataKey;
-  name: string;
-  subDirectories: SubDirectoryInfo[];
-  files: SummarizedFileInfo[];
-}
-
-interface RootDirectoryInfo {
-  id: "root";
-  parentId?: undefined;
-  dataKey?: undefined;
-  name?: undefined;
-  subDirectories: SubDirectoryInfo[];
-  files: SummarizedFileInfo[];
-}
-
-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 interface FileInfo {
-  id: number;
-  parentId: DirectoryId;
-  dataKey?: DataKey;
-  contentType: string;
-  contentIv?: string;
-  name: string;
-  createdAt?: Date;
-  lastModifiedAt: Date;
-  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">>);
-
-interface LocalCategoryInfo {
-  id: number;
-  dataKey?: DataKey;
-  name: string;
-  subCategories: SubCategoryInfo[];
-  files: CategoryFileInfo[];
-  isFileRecursive: boolean;
-}
-
-interface RootCategoryInfo {
-  id: "root";
-  dataKey?: undefined;
-  name?: undefined;
-  subCategories: SubCategoryInfo[];
-  files?: undefined;
-  isFileRecursive?: undefined;
-}
-
-export type CategoryInfo = LocalCategoryInfo | RootCategoryInfo;
-export type SubCategoryInfo = Omit<
-  LocalCategoryInfo,
-  "subCategories" | "files" | "isFileRecursive"
->;
-export type MaybeCategoryInfo =
-  | (CategoryInfo & { exists: true })
-  | ({ id: CategoryId; exists: false } & AllUndefined<Omit<CategoryInfo, "id">>);
--- a/src/lib/modules/scheduler.ts
+++ b/src/lib/modules/scheduler.ts
@@ -1,41 +0,0 @@
-export class Scheduler<T = void> {
-  private tasks = 0;
-  private memoryUsage = 0;
-  private queue: (() => void)[] = [];
-
-  constructor(public memoryLimit = 100 * 1024 * 1024 /* 100 MiB */) {}
-
-  private next() {
-    if (this.memoryUsage < this.memoryLimit) {
-      this.queue.shift()?.();
-    }
-  }
-
-  async schedule(estimateMemoryUsage: () => Promise<number>, task: () => Promise<T>) {
-    if (this.tasks++ > 0) {
-      await new Promise<void>((resolve) => {
-        this.queue.push(resolve);
-      });
-    }
-
-    while (this.memoryUsage >= this.memoryLimit) {
-      await new Promise<void>((resolve) => {
-        this.queue.unshift(resolve);
-      });
-    }
-
-    let taskMemoryUsage = 0;
-
-    try {
-      taskMemoryUsage = await estimateMemoryUsage();
-      this.memoryUsage += taskMemoryUsage;
-      this.next();
-
-      return await task();
-    } finally {
-      this.tasks--;
-      this.memoryUsage -= taskMemoryUsage;
-      this.next();
-    }
-  }
-}
--- a/src/lib/server/db/category.ts
+++ b/src/lib/server/db/category.ts
@@ -2,6 +2,8 @@ import { IntegrityError } from "./error";
 import db from "./kysely";
 import type { Ciphertext } from "./schema";

+export type CategoryId = "root" | number;
+
 interface Category {
  id: number;
  parentId: CategoryId;
--- a/src/lib/server/db/file.ts
+++ b/src/lib/server/db/file.ts
@@ -1,10 +1,11 @@
-import { sql } from "kysely";
-import { jsonArrayFrom } from "kysely/helpers/postgres";
+import { sql, type NotNull } from "kysely";
 import pg from "pg";
 import { IntegrityError } from "./error";
 import db from "./kysely";
 import type { Ciphertext } from "./schema";

+export type DirectoryId = "root" | number;
+
 interface Directory {
  id: number;
  parentId: DirectoryId;
@@ -37,14 +38,6 @@ interface File {

 export type NewFile = Omit<File, "id">;

-interface FileCategory {
-  id: number;
-  mekVersion: number;
-  encDek: string;
-  dekVersion: Date;
-  encName: Ciphertext;
-}
-
 export const registerDirectory = async (params: NewDirectory) => {
  await db.transaction().execute(async (trx) => {
    const mek = await trx
@@ -313,51 +306,39 @@ export const getAllFilesByCategory = async (
  recurse: boolean,
 ) => {
  const files = await db
-    .withRecursive("category_tree", (db) =>
+    .withRecursive("cte", (db) =>
      db
        .selectFrom("category")
-        .select(["id", sql<number>`0`.as("depth")])
+        .leftJoin("file_category", "category.id", "file_category.category_id")
+        .select(["id", "parent_id", "user_id", "file_category.file_id"])
+        .select(sql<number>`0`.as("depth"))
        .where("id", "=", categoryId)
-        .where("user_id", "=", userId)
        .$if(recurse, (qb) =>
          qb.unionAll((db) =>
            db
              .selectFrom("category")
-              .innerJoin("category_tree", "category.parent_id", "category_tree.id")
-              .select(["category.id", sql<number>`depth + 1`.as("depth")]),
+              .leftJoin("file_category", "category.id", "file_category.category_id")
+              .innerJoin("cte", "category.parent_id", "cte.id")
+              .select([
+                "category.id",
+                "category.parent_id",
+                "category.user_id",
+                "file_category.file_id",
+              ])
+              .select(sql<number>`cte.depth + 1`.as("depth")),
          ),
        ),
    )
-    .selectFrom("category_tree")
-    .innerJoin("file_category", "category_tree.id", "file_category.category_id")
-    .innerJoin("file", "file_category.file_id", "file.id")
+    .selectFrom("cte")
    .select(["file_id", "depth"])
-    .selectAll("file")
    .distinctOn("file_id")
+    .where("user_id", "=", userId)
+    .where("file_id", "is not", null)
+    .$narrowType<{ file_id: NotNull }>()
    .orderBy("file_id")
    .orderBy("depth")
    .execute();
-  return files.map(
-    (file) =>
-      ({
-        id: file.file_id,
-        parentId: file.parent_id ?? "root",
-        userId: file.user_id,
-        path: file.path,
-        mekVersion: file.master_encryption_key_version,
-        encDek: file.encrypted_data_encryption_key,
-        dekVersion: file.data_encryption_key_version,
-        hskVersion: file.hmac_secret_key_version,
-        contentHmac: file.content_hmac,
-        contentType: file.content_type,
-        encContentIv: file.encrypted_content_iv,
-        encContentHash: file.encrypted_content_hash,
-        encName: file.encrypted_name,
-        encCreatedAt: file.encrypted_created_at,
-        encLastModifiedAt: file.encrypted_last_modified_at,
-        isRecursive: file.depth > 0,
-      }) satisfies File & { isRecursive: boolean },
-  );
+  return files.map(({ file_id, depth }) => ({ id: file_id, isRecursive: depth > 0 }));
 };

 export const getAllFileIds = async (userId: number) => {
@@ -409,51 +390,6 @@ export const getFile = async (userId: number, fileId: number) => {
    : null;
 };

-export const getFilesWithCategories = async (userId: number, fileIds: number[]) => {
-  const files = await db
-    .selectFrom("file")
-    .selectAll()
-    .select((eb) =>
-      jsonArrayFrom(
-        eb
-          .selectFrom("file_category")
-          .innerJoin("category", "file_category.category_id", "category.id")
-          .where("file_category.file_id", "=", eb.ref("file.id"))
-          .selectAll("category"),
-      ).as("categories"),
-    )
-    .where("id", "=", (eb) => eb.fn.any(eb.val(fileIds)))
-    .where("user_id", "=", userId)
-    .execute();
-  return files.map(
-    (file) =>
-      ({
-        id: file.id,
-        parentId: file.parent_id ?? "root",
-        userId: file.user_id,
-        path: file.path,
-        mekVersion: file.master_encryption_key_version,
-        encDek: file.encrypted_data_encryption_key,
-        dekVersion: file.data_encryption_key_version,
-        hskVersion: file.hmac_secret_key_version,
-        contentHmac: file.content_hmac,
-        contentType: file.content_type,
-        encContentIv: file.encrypted_content_iv,
-        encContentHash: file.encrypted_content_hash,
-        encName: file.encrypted_name,
-        encCreatedAt: file.encrypted_created_at,
-        encLastModifiedAt: file.encrypted_last_modified_at,
-        categories: file.categories.map((category) => ({
-          id: category.id,
-          mekVersion: category.master_encryption_key_version,
-          encDek: category.encrypted_data_encryption_key,
-          dekVersion: new Date(category.data_encryption_key_version),
-          encName: category.encrypted_name,
-        })),
-      }) satisfies File & { categories: FileCategory[] },
-  );
-};
-
 export const setFileEncName = async (
  userId: number,
  fileId: number,
@@ -540,20 +476,10 @@ export const addFileToCategory = async (fileId: number, categoryId: number) => {
 export const getAllFileCategories = async (fileId: number) => {
  const categories = await db
    .selectFrom("file_category")
-    .innerJoin("category", "file_category.category_id", "category.id")
-    .selectAll("category")
+    .select("category_id")
    .where("file_id", "=", fileId)
    .execute();
-  return categories.map(
-    (category) =>
-      ({
-        id: category.id,
-        mekVersion: category.master_encryption_key_version,
-        encDek: category.encrypted_data_encryption_key,
-        dekVersion: category.data_encryption_key_version,
-        encName: category.encrypted_name,
-      }) satisfies FileCategory,
-  );
+  return categories.map(({ category_id }) => ({ id: category_id }));
 };

 export const removeFileFromCategory = async (fileId: number, categoryId: number) => {
--- a/src/lib/services/auth.ts
+++ b/src/lib/services/auth.ts
@@ -1,5 +1,6 @@
+import { TRPCClientError } from "@trpc/client";
 import { encodeToBase64, decryptChallenge, signMessageRSA } from "$lib/modules/crypto";
-import { trpc, isTRPCClientError } from "$trpc/client";
+import { trpc } from "$trpc/client";

 export const requestSessionUpgrade = async (
  encryptKeyBase64: string,
@@ -15,7 +16,7 @@ export const requestSessionUpgrade = async (
      sigPubKey: verifyKeyBase64,
    }));
  } catch (e) {
-    if (isTRPCClientError(e) && e.data?.code === "FORBIDDEN") {
+    if (e instanceof TRPCClientError && e.data?.code === "FORBIDDEN") {
      return [false, "Unregistered client"] as const;
    }
    return [false] as const;
@@ -30,7 +31,7 @@ export const requestSessionUpgrade = async (
      force,
    });
  } catch (e) {
-    if (isTRPCClientError(e) && e.data?.code === "CONFLICT") {
+    if (e instanceof TRPCClientError && e.data?.code === "CONFLICT") {
      return [false, "Already logged in"] as const;
    }
    return [false] as const;
--- a/src/lib/services/key.ts
+++ b/src/lib/services/key.ts
@@ -1,3 +1,4 @@
+import { TRPCClientError } from "@trpc/client";
 import { storeMasterKeys } from "$lib/indexedDB";
 import {
  encodeToBase64,
@@ -10,7 +11,7 @@ import {
 } from "$lib/modules/crypto";
 import { requestSessionUpgrade } from "$lib/services/auth";
 import { masterKeyStore, type ClientKeys } from "$lib/stores";
-import { trpc, isTRPCClientError } from "$trpc/client";
+import { trpc } from "$trpc/client";

 export const requestClientRegistration = async (
  encryptKeyBase64: string,
@@ -111,7 +112,10 @@ export const requestInitialMasterKeyAndHmacSecretRegistration = async (
      mekSig: await signMasterKeyWrapped(masterKeyWrapped, 1, signKey),
    });
  } catch (e) {
-    if (isTRPCClientError(e) && (e.data?.code === "FORBIDDEN" || e.data?.code === "CONFLICT")) {
+    if (
+      e instanceof TRPCClientError &&
+      (e.data?.code === "FORBIDDEN" || e.data?.code === "CONFLICT")
+    ) {
      return true;
    }
    // TODO: Error Handling
--- a/src/lib/stores/file.ts
+++ b/src/lib/stores/file.ts
@@ -0,0 +1,49 @@
+import { writable, type Writable } from "svelte/store";
+
+export interface FileUploadStatus {
+  name: string;
+  parentId: "root" | number;
+  status:
+    | "encryption-pending"
+    | "encrypting"
+    | "upload-pending"
+    | "uploading"
+    | "uploaded"
+    | "canceled"
+    | "error";
+  progress?: number;
+  rate?: number;
+  estimated?: number;
+}
+
+export interface FileDownloadStatus {
+  id: number;
+  status:
+    | "download-pending"
+    | "downloading"
+    | "decryption-pending"
+    | "decrypting"
+    | "decrypted"
+    | "canceled"
+    | "error";
+  progress?: number;
+  rate?: number;
+  estimated?: number;
+  result?: ArrayBuffer;
+}
+
+export const fileUploadStatusStore = writable<Writable<FileUploadStatus>[]>([]);
+
+export const fileDownloadStatusStore = writable<Writable<FileDownloadStatus>[]>([]);
+
+export const isFileUploading = (
+  status: FileUploadStatus["status"],
+): status is "encryption-pending" | "encrypting" | "upload-pending" | "uploading" => {
+  return ["encryption-pending", "encrypting", "upload-pending", "uploading"].includes(status);
+};
+
+export const isFileDownloading = (
+  status: FileDownloadStatus["status"],
+): status is "download-pending" | "downloading" | "decryption-pending" | "decrypting" => {
+  return ["download-pending", "downloading", "decryption-pending", "decrypting"].includes(status);
+};
--- a/src/lib/stores/index.ts
+++ b/src/lib/stores/index.ts
@@ -1 +1,2 @@
+export * from "./file";
 export * from "./key";
--- a/src/lib/types/filesystem.d.ts
+++ b/src/lib/types/filesystem.d.ts
@@ -1,2 +0,0 @@
-type DirectoryId = "root" | number;
-type CategoryId = "root" | number;
--- a/src/lib/utils/index.ts
+++ b/src/lib/utils/index.ts
@@ -1,4 +1,3 @@
 export * from "./format";
 export * from "./gotoStateful";
-export * from "./promise";
 export * from "./sort";
--- a/src/lib/utils/promise.ts
+++ b/src/lib/utils/promise.ts
@@ -1,16 +0,0 @@
-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);
-        }
-      });
-    });
-};
--- a/src/lib/utils/sort.ts
+++ b/src/lib/utils/sort.ts
@@ -32,7 +32,7 @@ const sortByDateAsc: SortFunc = ({ date: a }, { date: b }) => {

 const sortByDateDesc: SortFunc = (a, b) => -sortByDateAsc(a, b);

-export const sortEntries = <T extends SortEntry>(entries: T[], sortBy = SortBy.NAME_ASC) => {
+export const sortEntries = <T extends SortEntry>(entries: T[], sortBy: SortBy) => {
  let sortFunc: SortFunc;

  switch (sortBy) {
@@ -48,12 +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;
 };
--- a/src/routes/(fullscreen)/file/[id]/+page.svelte
+++ b/src/routes/(fullscreen)/file/[id]/+page.svelte
@@ -1,14 +1,19 @@
 <script lang="ts">
  import FileSaver from "file-saver";
  import { untrack } from "svelte";
+  import { get, type Writable } from "svelte/store";
  import { goto } from "$app/navigation";
  import { page } from "$app/state";
  import { FullscreenDiv } from "$lib/components/atoms";
  import { Categories, IconEntryButton, TopBar } from "$lib/components/molecules";
-  import { getFileInfo, type FileInfo, type MaybeFileInfo } from "$lib/modules/filesystem";
+  import {
+    getFileInfo,
+    getCategoryInfo,
+    type FileInfo,
+    type CategoryInfo,
+  } from "$lib/modules/filesystem";
  import { captureVideoThumbnail } from "$lib/modules/thumbnail";
-  import { getFileDownloadState } from "$lib/modules/file";
-  import { masterKeyStore } from "$lib/stores";
+  import { fileDownloadStatusStore, isFileDownloading, masterKeyStore } from "$lib/stores";
  import AddToCategoryBottomSheet from "./AddToCategoryBottomSheet.svelte";
  import DownloadStatus from "./DownloadStatus.svelte";
  import {
@@ -26,13 +31,19 @@

  let { data } = $props();

-  let infoPromise: Promise<MaybeFileInfo> | undefined = $state();
-  let info: FileInfo | null = $state(null);
-  let downloadState = $derived(getFileDownloadState(data.id));
+  let info: Writable<FileInfo | null> | undefined = $state();
+  let categories: Writable<CategoryInfo | null>[] = $state([]);

  let isMenuOpen = $state(false);
  let isAddToCategoryBottomSheetOpen = $state(false);

+  let downloadStatus = $derived(
+    $fileDownloadStatusStore.find((statusStore) => {
+      const { id, status } = get(statusStore);
+      return id === data.id && isFileDownloading(status);
+    }),
+  );
+
  let isDownloadRequested = $state(false);
  let viewerType: "image" | "video" | undefined = $state();
  let fileBlob: Blob | undefined = $state();
@@ -65,29 +76,28 @@
  const addToCategory = async (categoryId: number) => {
    await requestFileAdditionToCategory(data.id, categoryId);
    isAddToCategoryBottomSheetOpen = false;
-    infoPromise = getFileInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
+    info = getFileInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
  };

  const removeFromCategory = async (categoryId: number) => {
    await requestFileRemovalFromCategory(data.id, categoryId);
-    infoPromise = getFileInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
+    info = getFileInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
  };

  $effect(() => {
-    infoPromise = getFileInfo(data.id, $masterKeyStore?.get(1)?.key!).then((fileInfo) => {
-      if (fileInfo.exists) {
-        info = fileInfo;
-      }
-      return fileInfo;
-    });
-    info = null;
+    info = getFileInfo(data.id, $masterKeyStore?.get(1)?.key!);
    isDownloadRequested = false;
    viewerType = undefined;
  });

  $effect(() => {
-    if (info?.dataKey) {
-      const contentType = info.contentType;
+    categories =
+      $info?.categoryIds.map((id) => getCategoryInfo(id, $masterKeyStore?.get(1)?.key!)) ?? [];
+  });
+
+  $effect(() => {
+    if ($info && $info.dataKey && $info.contentIv) {
+      const contentType = $info.contentType;
      if (contentType.startsWith("image")) {
        viewerType = "image";
      } else if (contentType.startsWith("video")) {
@@ -95,24 +105,24 @@
      }

      untrack(() => {
-        if (!downloadState && !isDownloadRequested) {
+        if (!downloadStatus && !isDownloadRequested) {
          isDownloadRequested = true;
-          requestFileDownload(data.id, info!.contentIv!, info!.dataKey!.key).then(
-            async (buffer) => {
+          requestFileDownload(data.id, $info.contentIv!, $info.dataKey!).then(async (buffer) => {
            const blob = await updateViewer(buffer, contentType);
            if (!viewerType) {
-                FileSaver.saveAs(blob, info!.name);
+              FileSaver.saveAs(blob, $info.name);
            }
-            },
-          );
+          });
        }
      });
    }
  });

  $effect(() => {
-    if (info && downloadState?.status === "decrypted") {
-      untrack(() => !isDownloadRequested && updateViewer(downloadState.result!, info!.contentType));
+    if ($info && $downloadStatus?.status === "decrypted") {
+      untrack(
+        () => !isDownloadRequested && updateViewer($downloadStatus.result!, $info.contentType),
+      );
    }
  });

@@ -123,8 +133,7 @@
  <title>파일</title>
 </svelte:head>

-{#if info}
-  <TopBar title={info.name}>
+<TopBar title={$info?.name}>
  <!-- svelte-ignore a11y_no_static_element_interactions -->
  <!-- svelte-ignore a11y_click_events_have_key_events -->
  <div onclick={(e) => e.stopPropagation()}>
@@ -136,20 +145,16 @@
    </button>
    <TopBarMenu
      bind:isOpen={isMenuOpen}
-        directoryId={["category", "gallery"].includes(page.url.searchParams.get("from") ?? "")
-          ? info.parentId
-          : undefined}
+      directoryId={page.url.searchParams.get("from") === "category" ? $info?.parentId : undefined}
      {fileBlob}
-        filename={info.name}
+      filename={$info?.name}
    />
  </div>
 </TopBar>
 <FullscreenDiv>
  <div class="space-y-4 pb-4">
-      {#if downloadState}
-        <DownloadStatus state={downloadState} />
-      {/if}
-      {#if viewerType}
+    <DownloadStatus status={downloadStatus} />
+    {#if $info && viewerType}
      <div class="flex w-full justify-center">
        {#snippet viewerLoading(message: string)}
          <p class="text-gray-500">{message}</p>
@@ -157,17 +162,18 @@

        {#if viewerType === "image"}
          {#if fileBlobUrl}
-              <img src={fileBlobUrl} alt={info.name} onerror={convertHeicToJpeg} />
+            <img src={fileBlobUrl} alt={$info.name} onerror={convertHeicToJpeg} />
          {:else}
            {@render viewerLoading("이미지를 불러오고 있어요.")}
          {/if}
        {:else if viewerType === "video"}
          {#if fileBlobUrl}
            <div class="flex flex-col space-y-2">
+              <!-- svelte-ignore a11y_media_has_caption -->
              <video bind:this={videoElement} src={fileBlobUrl} controls muted></video>
              <IconEntryButton
                icon={IconCamera}
-                  onclick={() => updateThumbnail(info?.dataKey?.key!, info?.dataKey?.version!)}
+                onclick={() => updateThumbnail($info.dataKey!, $info.dataKeyVersion!)}
                class="w-full"
              >
                이 장면을 썸네일로 설정하기
@@ -183,7 +189,7 @@
      <p class="text-lg font-bold">카테고리</p>
      <div class="space-y-1">
        <Categories
-            categories={info.categories}
+          {categories}
          categoryMenuIcon={IconClose}
          onCategoryClick={({ id }) => goto(`/category/${id}`)}
          onCategoryMenuClick={({ id }) => removeFromCategory(id)}
@@ -206,4 +212,3 @@
  bind:isOpen={isAddToCategoryBottomSheetOpen}
  onAddToCategoryClick={addToCategory}
 />
-{/if}
--- a/src/routes/(fullscreen)/file/[id]/AddToCategoryBottomSheet.svelte
+++ b/src/routes/(fullscreen)/file/[id]/AddToCategoryBottomSheet.svelte
@@ -1,8 +1,9 @@
 <script lang="ts">
+  import type { Writable } from "svelte/store";
  import { BottomDiv, BottomSheet, Button, FullscreenDiv } from "$lib/components/atoms";
  import { SubCategories } from "$lib/components/molecules";
  import { CategoryCreateModal } from "$lib/components/organisms";
-  import { getCategoryInfo, type MaybeCategoryInfo } from "$lib/modules/filesystem";
+  import { getCategoryInfo, type CategoryInfo } from "$lib/modules/filesystem";
  import { masterKeyStore } from "$lib/stores";
  import { requestCategoryCreation } from "./service";

@@ -13,48 +14,46 @@

  let { onAddToCategoryClick, isOpen = $bindable() }: Props = $props();

-  let categoryInfoPromise: Promise<MaybeCategoryInfo> | undefined = $state();
+  let category: Writable<CategoryInfo | null> | undefined = $state();

  let isCategoryCreateModalOpen = $state(false);

  $effect(() => {
    if (isOpen) {
-      categoryInfoPromise = getCategoryInfo("root", $masterKeyStore?.get(1)?.key!);
+      category = getCategoryInfo("root", $masterKeyStore?.get(1)?.key!);
    }
  });
 </script>

-{#await categoryInfoPromise then categoryInfo}
-  {#if categoryInfo?.exists}
+{#if $category}
  <BottomSheet bind:isOpen class="flex flex-col">
    <FullscreenDiv>
      <SubCategories
        class="py-4"
-          info={categoryInfo}
+        info={$category}
        onSubCategoryClick={({ id }) =>
-            (categoryInfoPromise = getCategoryInfo(id, $masterKeyStore?.get(1)?.key!))}
+          (category = getCategoryInfo(id, $masterKeyStore?.get(1)?.key!))}
        onSubCategoryCreateClick={() => (isCategoryCreateModalOpen = true)}
        subCategoryCreatePosition="top"
      />
-        {#if categoryInfo.id !== "root"}
+      {#if $category.id !== "root"}
        <BottomDiv>
-            <Button onclick={() => onAddToCategoryClick(categoryInfo.id)} class="w-full">
+          <Button onclick={() => onAddToCategoryClick($category.id)} class="w-full">
            이 카테고리에 추가하기
          </Button>
        </BottomDiv>
      {/if}
    </FullscreenDiv>
  </BottomSheet>
+{/if}

 <CategoryCreateModal
  bind:isOpen={isCategoryCreateModalOpen}
  onCreateClick={async (name: string) => {
-        if (await requestCategoryCreation(name, categoryInfo.id, $masterKeyStore?.get(1)!)) {
-          categoryInfoPromise = getCategoryInfo(categoryInfo.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
+    if (await requestCategoryCreation(name, $category!.id, $masterKeyStore?.get(1)!)) {
+      category = getCategoryInfo($category!.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
      return true;
    }
    return false;
  }}
 />
-  {/if}
-{/await}
--- a/src/routes/(fullscreen)/file/[id]/DownloadStatus.svelte
+++ b/src/routes/(fullscreen)/file/[id]/DownloadStatus.svelte
@@ -1,31 +1,32 @@
 <script lang="ts">
-  import { isFileDownloading, type FileDownloadState } from "$lib/modules/file";
+  import type { Writable } from "svelte/store";
+  import { isFileDownloading, type FileDownloadStatus } from "$lib/stores";
  import { formatNetworkSpeed } from "$lib/utils";

  interface Props {
-    state: FileDownloadState;
+    status?: Writable<FileDownloadStatus>;
  }

-  let { state }: Props = $props();
+  let { status }: Props = $props();
 </script>

-{#if isFileDownloading(state.status)}
+{#if $status && isFileDownloading($status.status)}
  <div class="w-full rounded-xl bg-gray-100 p-3">
    <p class="font-medium">
-      {#if state.status === "download-pending"}
+      {#if $status.status === "download-pending"}
        다운로드를 기다리는 중
-      {:else if state.status === "downloading"}
+      {:else if $status.status === "downloading"}
        다운로드하는 중
-      {:else if state.status === "decryption-pending"}
+      {:else if $status.status === "decryption-pending"}
        복호화를 기다리는 중
-      {:else if state.status === "decrypting"}
+      {:else if $status.status === "decrypting"}
        복호화하는 중
      {/if}
    </p>
    <p class="text-xs">
-      {#if state.status === "downloading"}
+      {#if $status.status === "downloading"}
        전송됨
-        {Math.floor((state.progress ?? 0) * 100)}% · {formatNetworkSpeed((state.rate ?? 0) * 8)}
+        {Math.floor(($status.progress ?? 0) * 100)}% · {formatNetworkSpeed(($status.rate ?? 0) * 8)}
      {/if}
    </p>
  </div>
--- a/src/routes/(fullscreen)/file/downloads/+page.svelte
+++ b/src/routes/(fullscreen)/file/downloads/+page.svelte
@@ -1,31 +1,19 @@
 <script lang="ts">
-  import { onMount } from "svelte";
+  import { get } from "svelte/store";
  import { FullscreenDiv } from "$lib/components/atoms";
  import { TopBar } from "$lib/components/molecules";
-  import {
-    getDownloadingFiles,
-    clearDownloadedFiles,
-    type FileDownloadState,
-  } from "$lib/modules/file";
-  import { bulkGetFileInfo, type MaybeFileInfo } from "$lib/modules/filesystem";
-  import { masterKeyStore } from "$lib/stores";
+  import { fileDownloadStatusStore, isFileDownloading } from "$lib/stores";
  import File from "./File.svelte";

-  let downloadingFiles: { info: MaybeFileInfo; state: FileDownloadState }[] = $state([]);
-
-  onMount(async () => {
-    const states = getDownloadingFiles();
-    const infos = await bulkGetFileInfo(
-      states.map(({ id }) => id),
-      $masterKeyStore?.get(1)?.key!,
+  let downloadingFiles = $derived(
+    $fileDownloadStatusStore.filter((status) => isFileDownloading(get(status).status)),
  );
-    downloadingFiles = states.map((state) => ({
-      info: infos.get(state.id)!,
-      state,
-    }));
-  });

-  $effect(() => clearDownloadedFiles);
+  $effect(() => () => {
+    $fileDownloadStatusStore = $fileDownloadStatusStore.filter((status) =>
+      isFileDownloading(get(status).status),
+    );
+  });
 </script>

 <svelte:head>
@@ -35,10 +23,8 @@
 <TopBar />
 <FullscreenDiv>
  <div class="space-y-2 pb-4">
-    {#each downloadingFiles as { info, state } (info.id)}
-      {#if info.exists}
-        <File {info} {state} />
-      {/if}
+    {#each downloadingFiles as status}
+      <File {status} />
    {/each}
  </div>
 </FullscreenDiv>
--- a/src/routes/(fullscreen)/file/downloads/File.svelte
+++ b/src/routes/(fullscreen)/file/downloads/File.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
-  import type { FileDownloadState } from "$lib/modules/file";
-  import type { SummarizedFileInfo } from "$lib/modules/filesystem";
+  import { get, type Writable } from "svelte/store";
+  import { getFileInfo, type FileInfo } from "$lib/modules/filesystem";
+  import { masterKeyStore, type FileDownloadStatus } from "$lib/stores";
  import { formatNetworkSpeed } from "$lib/utils";

  import IconCloud from "~icons/material-symbols/cloud";
@@ -11,49 +12,56 @@
  import IconError from "~icons/material-symbols/error";

  interface Props {
-    info: SummarizedFileInfo;
-    state: FileDownloadState;
+    status: Writable<FileDownloadStatus>;
  }

-  let { info, state }: Props = $props();
+  let { status }: Props = $props();
+
+  let fileInfo: Writable<FileInfo | null> | undefined = $state();
+
+  $effect(() => {
+    fileInfo = getFileInfo(get(status).id, $masterKeyStore?.get(1)?.key!);
+  });
 </script>

+{#if $fileInfo}
  <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 === "download-pending"}
+      {#if $status.status === "download-pending"}
        <IconCloud />
-    {:else if state.status === "downloading"}
+      {:else if $status.status === "downloading"}
        <IconCloudDownload />
-    {:else if state.status === "decryption-pending"}
+      {:else if $status.status === "decryption-pending"}
        <IconLock />
-    {:else if state.status === "decrypting"}
+      {:else if $status.status === "decrypting"}
        <IconLockClock />
-    {:else if state.status === "decrypted"}
+      {:else if $status.status === "decrypted"}
        <IconCheckCircle class="text-green-500" />
-    {:else if state.status === "error"}
+      {:else if $status.status === "error"}
        <IconError class="text-red-500" />
      {/if}
    </div>
    <div class="flex-grow overflow-hidden">
-    <p title={info.name} class="truncate font-medium">
-      {info.name}
+      <p title={$fileInfo.name} class="truncate font-medium">
+        {$fileInfo.name}
      </p>
      <p class="text-xs text-gray-800">
-      {#if state.status === "download-pending"}
+        {#if $status.status === "download-pending"}
          다운로드를 기다리는 중
-      {:else if state.status === "downloading"}
+        {:else if $status.status === "downloading"}
          전송됨
-        {Math.floor((state.progress ?? 0) * 100)}% ·
-        {formatNetworkSpeed((state.rate ?? 0) * 8)}
-      {:else if state.status === "decryption-pending"}
+          {Math.floor(($status.progress ?? 0) * 100)}% ·
+          {formatNetworkSpeed(($status.rate ?? 0) * 8)}
+        {:else if $status.status === "decryption-pending"}
          복호화를 기다리는 중
-      {:else if state.status === "decrypting"}
+        {:else if $status.status === "decrypting"}
          복호화하는 중
-      {:else if state.status === "decrypted"}
+        {:else if $status.status === "decrypted"}
          다운로드 완료
-      {:else if state.status === "error"}
+        {:else if $status.status === "error"}
          다운로드 실패
        {/if}
      </p>
    </div>
  </div>
+{/if}
--- a/src/routes/(fullscreen)/file/uploads/+page.svelte
+++ b/src/routes/(fullscreen)/file/uploads/+page.svelte
@@ -1,12 +1,19 @@
 <script lang="ts">
+  import { get } from "svelte/store";
  import { FullscreenDiv } from "$lib/components/atoms";
  import { TopBar } from "$lib/components/molecules";
-  import { getUploadingFiles, clearUploadedFiles } from "$lib/modules/file";
+  import { fileUploadStatusStore, isFileUploading } from "$lib/stores";
  import File from "./File.svelte";

-  const uploadingFiles = getUploadingFiles();
+  let uploadingFiles = $derived(
+    $fileUploadStatusStore.filter((status) => isFileUploading(get(status).status)),
+  );

-  $effect(() => clearUploadedFiles);
+  $effect(() => () => {
+    $fileUploadStatusStore = $fileUploadStatusStore.filter((status) =>
+      isFileUploading(get(status).status),
+    );
+  });
 </script>

 <svelte:head>
@@ -16,8 +23,8 @@
 <TopBar />
 <FullscreenDiv>
  <div class="space-y-2 pb-4">
-    {#each uploadingFiles as file}
-      <File state={file} />
+    {#each uploadingFiles as status}
+      <File {status} />
    {/each}
  </div>
 </FullscreenDiv>
--- a/src/routes/(fullscreen)/file/uploads/File.svelte
+++ b/src/routes/(fullscreen)/file/uploads/File.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-  import type { FileUploadState } from "$lib/modules/file";
+  import type { Writable } from "svelte/store";
+  import type { FileUploadStatus } from "$lib/stores";
  import { formatNetworkSpeed } from "$lib/utils";

  import IconPending from "~icons/material-symbols/pending";
@@ -10,47 +11,45 @@
  import IconError from "~icons/material-symbols/error";

  interface Props {
-    state: FileUploadState;
+    status: Writable<FileUploadStatus>;
  }

-  let { state }: Props = $props();
+  let { status }: Props = $props();
 </script>

 <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 $status.status === "encryption-pending"}
      <IconPending />
-    {:else if state.status === "encrypting"}
+    {:else if $status.status === "encrypting"}
      <IconLockClock />
-    {:else if state.status === "upload-pending"}
+    {:else if $status.status === "upload-pending"}
      <IconCloud />
-    {:else if state.status === "uploading"}
+    {:else if $status.status === "uploading"}
      <IconCloudUpload />
-    {:else if state.status === "uploaded"}
+    {:else if $status.status === "uploaded"}
      <IconCloudDone class="text-blue-500" />
-    {:else if state.status === "error"}
+    {:else if $status.status === "error"}
      <IconError class="text-red-500" />
    {/if}
  </div>
  <div class="flex-grow overflow-hidden">
-    <p title={state.name} class="truncate font-medium">
-      {state.name}
+    <p title={$status.name} class="truncate font-medium">
+      {$status.name}
    </p>
    <p class="text-xs text-gray-800">
-      {#if state.status === "queued"}
-        대기 중
-      {:else if state.status === "encryption-pending"}
+      {#if $status.status === "encryption-pending"}
        준비 중
-      {:else if state.status === "encrypting"}
+      {:else if $status.status === "encrypting"}
        암호화하는 중
-      {:else if state.status === "upload-pending"}
+      {:else if $status.status === "upload-pending"}
        업로드를 기다리는 중
-      {:else if state.status === "uploading"}
+      {:else if $status.status === "uploading"}
        전송됨
-        {Math.floor((state.progress ?? 0) * 100)}% · {formatNetworkSpeed((state.rate ?? 0) * 8)}
-      {:else if state.status === "uploaded"}
+        {Math.floor(($status.progress ?? 0) * 100)}% · {formatNetworkSpeed(($status.rate ?? 0) * 8)}
+      {:else if $status.status === "uploaded"}
        업로드 완료
-      {:else if state.status === "error"}
+      {:else if $status.status === "error"}
        업로드 실패
      {/if}
    </p>
--- a/src/routes/(fullscreen)/gallery/+page.server.ts
+++ b/src/routes/(fullscreen)/gallery/+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.list();
-  return { files };
-};
--- a/src/routes/(fullscreen)/gallery/+page.svelte
+++ b/src/routes/(fullscreen)/gallery/+page.svelte
@@ -1,18 +1,18 @@
 <script lang="ts">
-  import { onMount } from "svelte";
+  import type { Writable } from "svelte/store";
  import { goto } from "$app/navigation";
  import { FullscreenDiv } from "$lib/components/atoms";
  import { TopBar } from "$lib/components/molecules";
  import { Gallery } from "$lib/components/organisms";
-  import { bulkGetFileInfo, type MaybeFileInfo } from "$lib/modules/filesystem";
+  import { getFileInfo, type FileInfo } from "$lib/modules/filesystem";
  import { masterKeyStore } from "$lib/stores";

  let { data } = $props();

-  let files: MaybeFileInfo[] = $state([]);
+  let files: Writable<FileInfo | null>[] = $state([]);

-  onMount(async () => {
-    files = Array.from((await bulkGetFileInfo(data.files, $masterKeyStore?.get(1)?.key!)).values());
+  $effect(() => {
+    files = data.files.map((file) => getFileInfo(file, $masterKeyStore?.get(1)?.key!));
  });
 </script>

@@ -22,8 +22,5 @@

 <TopBar title="사진 및 동영상" />
 <FullscreenDiv>
-  <Gallery
-    files={files.filter((file) => file?.exists)}
-    onFileClick={({ id }) => goto(`/file/${id}?from=gallery`)}
-  />
+  <Gallery {files} onFileClick={({ id }) => goto(`/file/${id}`)} />
 </FullscreenDiv>
--- a/src/routes/(fullscreen)/gallery/+page.ts
+++ b/src/routes/(fullscreen)/gallery/+page.ts
@@ -0,0 +1,7 @@
+import { trpc } from "$trpc/client";
+import type { PageLoad } from "./$types";
+
+export const load: PageLoad = async ({ fetch }) => {
+  const files = await trpc(fetch).file.list.query();
+  return { files };
+};
--- a/src/routes/(fullscreen)/settings/cache/+page.svelte
+++ b/src/routes/(fullscreen)/settings/cache/+page.svelte
@@ -1,39 +1,42 @@
 <script lang="ts">
  import { onMount } from "svelte";
+  import type { Writable } from "svelte/store";
  import { FullscreenDiv } from "$lib/components/atoms";
  import { TopBar } from "$lib/components/molecules";
  import type { FileCacheIndex } from "$lib/indexedDB";
  import { getFileCacheIndex, deleteFileCache as doDeleteFileCache } from "$lib/modules/file";
-  import { bulkGetFileInfo, type MaybeFileInfo } from "$lib/modules/filesystem";
+  import { getFileInfo, type FileInfo } from "$lib/modules/filesystem";
  import { masterKeyStore } from "$lib/stores";
  import { formatFileSize } from "$lib/utils";
  import File from "./File.svelte";

  interface FileCache {
    index: FileCacheIndex;
-    info: MaybeFileInfo;
+    fileInfo: Writable<FileInfo | null>;
  }

  let fileCache: FileCache[] | undefined = $state();
-  let fileCacheTotalSize = $derived(
-    fileCache?.reduce((acc, { index }) => acc + index.size, 0) ?? 0,
-  );
+  let fileCacheTotalSize = $state(0);

  const deleteFileCache = async (fileId: number) => {
    await doDeleteFileCache(fileId);
    fileCache = fileCache?.filter(({ index }) => index.fileId !== fileId);
  };

-  onMount(async () => {
-    const indexes = getFileCacheIndex();
-    const infos = await bulkGetFileInfo(
-      indexes.map(({ fileId }) => fileId),
-      $masterKeyStore?.get(1)?.key!,
-    );
-    fileCache = indexes
-      .map((index) => ({ index, info: infos.get(index.fileId)! }))
+  onMount(() => {
+    fileCache = getFileCacheIndex()
+      .map((index) => ({
+        index,
+        fileInfo: getFileInfo(index.fileId, $masterKeyStore?.get(1)?.key!),
+      }))
      .sort((a, b) => a.index.lastRetrievedAt.getTime() - b.index.lastRetrievedAt.getTime());
  });
+
+  $effect(() => {
+    if (fileCache) {
+      fileCacheTotalSize = fileCache.reduce((acc, { index }) => acc + index.size, 0);
+    }
+  });
 </script>

 <svelte:head>
@@ -52,8 +55,8 @@
        <p>캐시를 삭제하더라도 원본 파일은 삭제되지 않아요.</p>
      </div>
      <div class="space-y-2">
-        {#each fileCache as { index, info } (info.id)}
-          <File {index} {info} onDeleteClick={deleteFileCache} />
+        {#each fileCache as { index, fileInfo }}
+          <File {index} info={fileInfo} onDeleteClick={deleteFileCache} />
        {/each}
      </div>
    </div>
--- a/src/routes/(fullscreen)/settings/cache/File.svelte
+++ b/src/routes/(fullscreen)/settings/cache/File.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
+  import type { Writable } from "svelte/store";
  import type { FileCacheIndex } from "$lib/indexedDB";
-  import type { MaybeFileInfo } from "$lib/modules/filesystem";
+  import type { FileInfo } from "$lib/modules/filesystem";
  import { formatDate, formatFileSize } from "$lib/utils";

  import IconDraft from "~icons/material-symbols/draft";
@@ -9,7 +10,7 @@

  interface Props {
    index: FileCacheIndex;
-    info: MaybeFileInfo;
+    info: Writable<FileInfo | null>;
    onDeleteClick: (fileId: number) => void;
  }

@@ -17,7 +18,7 @@
 </script>

 <div class="flex h-14 items-center gap-x-4 p-2">
-  {#if info.exists}
+  {#if $info}
    <div class="flex-shrink-0 rounded-full bg-blue-100 p-1 text-xl">
      <IconDraft class="text-blue-400" />
    </div>
@@ -27,8 +28,8 @@
    </div>
  {/if}
  <div class="flex-grow overflow-hidden">
-    {#if info.exists}
-      <p title={info.name} class="truncate font-medium">{info.name}</p>
+    {#if $info}
+      <p title={$info.name} class="truncate font-medium">{$info.name}</p>
    {:else}
      <p class="font-medium">삭제된 파일</p>
    {/if}
--- a/src/routes/(fullscreen)/settings/thumbnail/+page.server.ts
+++ b/src/routes/(fullscreen)/settings/thumbnail/+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.listWithoutThumbnail();
-  return { files };
-};
--- a/src/routes/(fullscreen)/settings/thumbnail/+page.svelte
+++ b/src/routes/(fullscreen)/settings/thumbnail/+page.svelte
@@ -1,52 +1,39 @@
 <script lang="ts">
  import { onMount } from "svelte";
+  import { get } from "svelte/store";
  import { goto } from "$app/navigation";
  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 { getFileInfo } from "$lib/modules/filesystem";
  import { masterKeyStore } from "$lib/stores";
-  import { sortEntries } from "$lib/utils";
  import File from "./File.svelte";
  import {
-    getThumbnailGenerationStatus,
-    clearThumbnailGenerationStatuses,
+    persistentStates,
+    getGenerationStatus,
    requestThumbnailGeneration,
-    type GenerationStatus,
-  } from "./service";
+  } from "./service.svelte";

  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 }) => {
-      if (info.exists) {
-        requestThumbnailGeneration(info);
+    persistentStates.files.forEach(({ info }) => {
+      const fileInfo = get(info);
+      if (fileInfo) {
+        requestThumbnailGeneration(fileInfo);
      }
    });
  };

-  onMount(async () => {
-    fileInfos = sortEntries(
-      Array.from((await bulkGetFileInfo(data.files, $masterKeyStore?.get(1)?.key!)).values()),
-    );
+  onMount(() => {
+    persistentStates.files = data.files.map((fileId) => ({
+      id: fileId,
+      info: getFileInfo(fileId, $masterKeyStore?.get(1)?.key!),
+      status: getGenerationStatus(fileId),
+    }));
  });
-
-  $effect(() => clearThumbnailGenerationStatuses);
 </script>

 <svelte:head>
@@ -61,30 +48,28 @@
        저장된 썸네일 모두 삭제하기
      </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)}
-              {#if info.exists}
+            {#each persistentStates.files as { info, status }}
              <File
                {info}
-                  {status}
+                generationStatus={status}
                onclick={({ id }) => goto(`/file/${id}`)}
                onGenerateThumbnailClick={requestThumbnailGeneration}
              />
-              {/if}
            {/each}
          </div>
        </div>
      </div>
    {/if}
  </div>
-  {#if files.length > 0}
+  {#if persistentStates.files.length > 0}
    <BottomDiv class="px-4">
      <Button onclick={generateAllThumbnails} class="w-full">모두 썸네일 생성하기</Button>
    </BottomDiv>
--- a/src/routes/(fullscreen)/settings/thumbnail/+page.ts
+++ b/src/routes/(fullscreen)/settings/thumbnail/+page.ts
@@ -0,0 +1,7 @@
+import { trpc } from "$trpc/client";
+import type { PageLoad } from "./$types";
+
+export const load: PageLoad = async ({ fetch }) => {
+  const files = await trpc(fetch).file.listWithoutThumbnail.query();
+  return { files };
+};
--- a/src/routes/(fullscreen)/settings/thumbnail/File.svelte
+++ b/src/routes/(fullscreen)/settings/thumbnail/File.svelte
@@ -10,33 +10,37 @@
 </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";

  interface Props {
-    info: FileInfo;
-    onclick: (file: FileInfo) => void;
-    onGenerateThumbnailClick: (file: FileInfo) => void;
-    status: Exclude<GenerationStatus, "uploaded"> | undefined;
+    info: Writable<FileInfo | null>;
+    onclick: (selectedFile: FileInfo) => void;
+    onGenerateThumbnailClick: (selectedFile: FileInfo) => void;
+    generationStatus?: Writable<GenerationStatus>;
  }

-  let { info, onclick, onGenerateThumbnailClick, status }: Props = $props();
+  let { info, onclick, onGenerateThumbnailClick, generationStatus }: Props = $props();
 </script>

+{#if $info}
  <ActionEntryButton
    class="h-14"
-  onclick={() => onclick(info)}
-  actionButtonIcon={!status || status === "error" ? IconCamera : undefined}
-  onActionButtonClick={() => onGenerateThumbnailClick(info)}
+    onclick={() => onclick($info)}
+    actionButtonIcon={!$generationStatus || $generationStatus === "error" ? IconCamera : undefined}
+    onActionButtonClick={() => onGenerateThumbnailClick($info)}
    actionButtonClass="text-gray-800"
  >
-  {@const subtext = status
-    ? subtexts[status]
-    : formatDateTime(info.createdAt ?? info.lastModifiedAt)}
-  <DirectoryEntryLabel type="file" name={info.name} {subtext} />
+    {@const subtext =
+      $generationStatus && $generationStatus !== "uploaded"
+        ? subtexts[$generationStatus]
+        : formatDateTime($info.createdAt ?? $info.lastModifiedAt)}
+    <DirectoryEntryLabel type="file" name={$info.name} {subtext} />
  </ActionEntryButton>
+{/if}
--- a/src/routes/(fullscreen)/settings/thumbnail/service.svelte.ts
+++ b/src/routes/(fullscreen)/settings/thumbnail/service.svelte.ts
@@ -0,0 +1,158 @@
+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 } 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: Writable<FileInfo | null>;
+  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!);
+    fileSize = file.byteLength;
+
+    memoryUsage += fileSize;
+    if (memoryUsage < memoryLimit) {
+      queue.shift()?.();
+    }
+
+    const thumbnail = await generateThumbnail(
+      status,
+      file,
+      fileInfo.contentType,
+      fileInfo.dataKey!,
+    );
+    if (
+      !thumbnail ||
+      !(await requestThumbnailUpload(status, fileInfo.id, fileInfo.dataKeyVersion!, thumbnail))
+    ) {
+      status.set("error");
+    }
+  } catch {
+    status.set("error");
+  } finally {
+    memoryUsage -= fileSize;
+    queue.shift()?.();
+  }
+};
--- a/src/routes/(fullscreen)/settings/thumbnail/service.ts
+++ b/src/routes/(fullscreen)/settings/thumbnail/service.ts
@@ -1,102 +0,0 @@
-import { limitFunction } from "p-limit";
-import { SvelteMap } from "svelte/reactivity";
-import { encryptData } from "$lib/modules/crypto";
-import { storeFileThumbnailCache } from "$lib/modules/file";
-import type { FileInfo } from "$lib/modules/filesystem";
-import { Scheduler } from "$lib/modules/scheduler";
-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";
-
-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 generateThumbnail = limitFunction(
-  async (fileId: number, fileBuffer: ArrayBuffer, fileType: string, dataKey: CryptoKey) => {
-    statuses.set(fileId, "generating");
-
-    const thumbnail = await doGenerateThumbnail(fileBuffer, fileType);
-    if (!thumbnail) return null;
-
-    const thumbnailBuffer = await thumbnail.arrayBuffer();
-    const thumbnailEncrypted = await encryptData(thumbnailBuffer, dataKey);
-    statuses.set(fileId, "upload-pending");
-    return { plaintext: thumbnailBuffer, ...thumbnailEncrypted };
-  },
-  { concurrency: 4 },
-);
-
-const requestThumbnailUpload = limitFunction(
-  async (
-    fileId: number,
-    dataKeyVersion: Date,
-    thumbnail: { plaintext: ArrayBuffer; ciphertext: ArrayBuffer; iv: string },
-  ) => {
-    statuses.set(fileId, "uploading");
-
-    const res = await requestFileThumbnailUpload(fileId, dataKeyVersion, thumbnail);
-    if (!res.ok) return false;
-    statuses.set(fileId, "uploaded");
-    storeFileThumbnailCache(fileId, thumbnail.plaintext); // Intended
-    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.contentIv!, fileInfo.dataKey?.key!);
-        return file.byteLength;
-      },
-      async () => {
-        const thumbnail = await generateThumbnail(
-          fileInfo.id,
-          file!,
-          fileInfo.contentType,
-          fileInfo.dataKey?.key!,
-        );
-        if (
-          !thumbnail ||
-          !(await requestThumbnailUpload(fileInfo.id, fileInfo.dataKey?.version!, thumbnail))
-        ) {
-          statuses.set(fileInfo.id, "error");
-        }
-      },
-    );
-  } catch (e) {
-    statuses.set(fileInfo.id, "error");
-    throw e;
-  }
-};
--- a/src/routes/(main)/category/[[id]]/+page.svelte
+++ b/src/routes/(main)/category/[[id]]/+page.svelte
@@ -1,8 +1,9 @@
 <script lang="ts">
+  import type { Writable } from "svelte/store";
  import { goto } from "$app/navigation";
  import { TopBar } from "$lib/components/molecules";
  import { Category, CategoryCreateModal } from "$lib/components/organisms";
-  import { getCategoryInfo, type MaybeCategoryInfo } from "$lib/modules/filesystem";
+  import { getCategoryInfo, updateCategoryInfo, type CategoryInfo } from "$lib/modules/filesystem";
  import { masterKeyStore } from "$lib/stores";
  import CategoryDeleteModal from "./CategoryDeleteModal.svelte";
  import CategoryMenuBottomSheet from "./CategoryMenuBottomSheet.svelte";
@@ -18,7 +19,9 @@
  let { data } = $props();
  let context = createContext();

-  let infoPromise: Promise<MaybeCategoryInfo> | undefined = $state();
+  let info: Writable<CategoryInfo | null> | undefined = $state();
+
+  let isFileRecursive: boolean | undefined = $state();

  let isCategoryCreateModalOpen = $state(false);
  let isCategoryMenuBottomSheetOpen = $state(false);
@@ -26,7 +29,20 @@
  let isCategoryDeleteModalOpen = $state(false);

  $effect(() => {
-    infoPromise = getCategoryInfo(data.id, $masterKeyStore?.get(1)?.key!);
+    info = getCategoryInfo(data.id, $masterKeyStore?.get(1)?.key!);
+    isFileRecursive = undefined;
+  });
+
+  $effect(() => {
+    if ($info && isFileRecursive === undefined) {
+      isFileRecursive = $info.isFileRecursive ?? false;
+    }
+  });
+
+  $effect(() => {
+    if (data.id !== "root" && $info?.isFileRecursive !== isFileRecursive) {
+      updateCategoryInfo(data.id as number, { isFileRecursive });
+    }
  });
 </script>

@@ -34,19 +50,18 @@
  <title>카테고리</title>
 </svelte:head>

-{#await infoPromise then info}
-  {#if info?.exists}
-    {#if info.id !== "root"}
-      <TopBar title={info.name} />
+{#if data.id !== "root"}
+  <TopBar title={$info?.name} />
 {/if}
 <div class="min-h-full bg-gray-100 pb-[5.5em]">
+  {#if $info && isFileRecursive !== undefined}
    <Category
-        bind:isFileRecursive={info.isFileRecursive}
-        {info}
+      bind:isFileRecursive
+      info={$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
+        info = getCategoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
      }}
      onSubCategoryClick={({ id }) => goto(`/category/${id}`)}
      onSubCategoryCreateClick={() => (isCategoryCreateModalOpen = true)}
@@ -55,13 +70,14 @@
        isCategoryMenuBottomSheetOpen = true;
      }}
    />
+  {/if}
 </div>

 <CategoryCreateModal
  bind:isOpen={isCategoryCreateModalOpen}
  onCreateClick={async (name: string) => {
    if (await requestCategoryCreation(name, data.id, $masterKeyStore?.get(1)!)) {
-          infoPromise = getCategoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
+      info = getCategoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
      return true;
    }
    return false;
@@ -83,7 +99,7 @@
  bind:isOpen={isCategoryRenameModalOpen}
  onRenameClick={async (newName: string) => {
    if (await requestCategoryRename(context.selectedCategory!, newName)) {
-          infoPromise = getCategoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
+      info = getCategoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
      return true;
    }
    return false;
@@ -93,11 +109,9 @@
  bind:isOpen={isCategoryDeleteModalOpen}
  onDeleteClick={async () => {
    if (await requestCategoryDeletion(context.selectedCategory!)) {
-          infoPromise = getCategoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
+      info = getCategoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
      return true;
    }
    return false;
  }}
 />
-  {/if}
-{/await}
--- a/src/routes/(main)/category/[[id]]/service.svelte.ts
+++ b/src/routes/(main)/category/[[id]]/service.svelte.ts
@@ -17,17 +17,12 @@ export const useContext = () => {
 };

 export const requestCategoryRename = async (category: SelectedCategory, newName: string) => {
-  if (!category.dataKey) {
-    // TODO: Error Handling
-    return false;
-  }
-
-  const newNameEncrypted = await encryptString(newName, category.dataKey.key);
+  const newNameEncrypted = await encryptString(newName, category.dataKey);

  try {
    await trpc().category.rename.mutate({
      id: category.id,
-      dekVersion: category.dataKey.version,
+      dekVersion: category.dataKeyVersion,
      name: newNameEncrypted.ciphertext,
      nameIv: newNameEncrypted.iv,
    });
--- a/src/routes/(main)/directory/[[id]]/+page.svelte
+++ b/src/routes/(main)/directory/[[id]]/+page.svelte
@@ -1,10 +1,11 @@
 <script lang="ts">
  import { onMount } from "svelte";
+  import type { Writable } from "svelte/store";
  import { goto } from "$app/navigation";
  import { page } from "$app/state";
  import { FloatingButton } from "$lib/components/atoms";
  import { TopBar } from "$lib/components/molecules";
-  import { getDirectoryInfo, type MaybeDirectoryInfo } from "$lib/modules/filesystem";
+  import { getDirectoryInfo, type DirectoryInfo } from "$lib/modules/filesystem";
  import { masterKeyStore, hmacSecretStore } from "$lib/stores";
  import DirectoryCreateModal from "./DirectoryCreateModal.svelte";
  import DirectoryEntries from "./DirectoryEntries";
@@ -29,7 +30,7 @@
  let { data } = $props();
  let context = createContext();

-  let infoPromise: Promise<MaybeDirectoryInfo> | undefined = $state();
+  let info: Writable<DirectoryInfo | null> | undefined = $state();
  let fileInput: HTMLInputElement | undefined = $state();
  let duplicatedFile: File | undefined = $state();
  let resolveForDuplicateFileModal: ((res: boolean) => void) | undefined = $state();
@@ -60,7 +61,7 @@
        .then((res) => {
          if (!res) return;
          // TODO: FIXME
-          infoPromise = getDirectoryInfo(data.id, $masterKeyStore?.get(1)?.key!);
+          info = getDirectoryInfo(data.id, $masterKeyStore?.get(1)?.key!);
        })
        .catch((e: Error) => {
          // TODO: FIXME
@@ -78,7 +79,7 @@
  });

  $effect(() => {
-    infoPromise = getDirectoryInfo(data.id, $masterKeyStore?.get(1)?.key!);
+    info = getDirectoryInfo(data.id, $masterKeyStore?.get(1)?.key!);
  });
 </script>

@@ -88,33 +89,35 @@

 <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}
    <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}
        <DirectoryEntries
-          {info}
+          info={$info}
          onEntryClick={({ type, id }) => goto(`/${type}/${id}`)}
          onEntryMenuClick={(entry) => {
            context.selectedEntry = entry;
            isEntryMenuBottomSheetOpen = true;
          }}
-          showParentEntry={isFromFilePage && info.parentId !== undefined}
+          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
@@ -139,7 +142,7 @@
  bind:isOpen={isDirectoryCreateModalOpen}
  onCreateClick={async (name) => {
    if (await requestDirectoryCreation(name, data.id, $masterKeyStore?.get(1)!)) {
-          infoPromise = getDirectoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
+      info = getDirectoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
      return true;
    }
    return false;
@@ -173,7 +176,7 @@
  bind:isOpen={isEntryRenameModalOpen}
  onRenameClick={async (newName: string) => {
    if (await requestEntryRename(context.selectedEntry!, newName)) {
-          infoPromise = getDirectoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
+      info = getDirectoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
      return true;
    }
    return false;
@@ -183,11 +186,9 @@
  bind:isOpen={isEntryDeleteModalOpen}
  onDeleteClick={async () => {
    if (await requestEntryDeletion(context.selectedEntry!)) {
-          infoPromise = getDirectoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
+      info = getDirectoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
      return true;
    }
    return false;
  }}
 />
-  {/if}
-{/await}
--- a/src/routes/(main)/directory/[[id]]/DirectoryEntries/DirectoryEntries.svelte
+++ b/src/routes/(main)/directory/[[id]]/DirectoryEntries/DirectoryEntries.svelte
@@ -1,9 +1,21 @@
 <script lang="ts">
-  import { ActionEntryButton, RowVirtualizer } from "$lib/components/atoms";
+  import { untrack } from "svelte";
+  import { get, type Writable } from "svelte/store";
+  import { ActionEntryButton } from "$lib/components/atoms";
  import { DirectoryEntryLabel } from "$lib/components/molecules";
-  import { getUploadingFiles, type LiveFileUploadState } from "$lib/modules/file";
-  import type { DirectoryInfo } from "$lib/modules/filesystem";
-  import { sortEntries } from "$lib/utils";
+  import {
+    getDirectoryInfo,
+    getFileInfo,
+    type DirectoryInfo,
+    type FileInfo,
+  } from "$lib/modules/filesystem";
+  import {
+    fileUploadStatusStore,
+    isFileUploading,
+    masterKeyStore,
+    type FileUploadStatus,
+  } from "$lib/stores";
+  import { SortBy, sortEntries } from "$lib/utils";
  import File from "./File.svelte";
  import SubDirectory from "./SubDirectory.svelte";
  import UploadingFile from "./UploadingFile.svelte";
@@ -15,6 +27,7 @@
    onEntryMenuClick: (entry: SelectedEntry) => void;
    onParentClick?: () => void;
    showParentEntry?: boolean;
+    sortBy?: SortBy;
  }

  let {
@@ -23,49 +36,105 @@
    onEntryMenuClick,
    onParentClick,
    showParentEntry = false,
+    sortBy = SortBy.NAME_ASC,
  }: Props = $props();

-  type Entry =
-    | { type: "parent" }
-    | { type: "directory"; name: string; details: (typeof info.subDirectories)[number] }
-    | { type: "file"; name: string; details: (typeof info.files)[number] }
-    | { type: "uploading-file"; name: string; details: LiveFileUploadState };
+  interface DirectoryEntry {
+    name?: string;
+    info: Writable<DirectoryInfo | null>;
+  }

-  const toEntry =
-    <T extends Exclude<Entry["type"], "parent">>(type: T) =>
-    (details: Extract<Entry, { type: T }>["details"]) => ({ type, name: details.name, details });
+  type FileEntry =
+    | {
+        type: "file";
+        name?: string;
+        info: Writable<FileInfo | null>;
+      }
+    | {
+        type: "uploading-file";
+        name: string;
+        info: Writable<FileUploadStatus>;
+      };

-  let entries = $derived([
-    ...(showParentEntry ? ([{ type: "parent" }] as const) : []),
-    ...sortEntries(info.subDirectories.map(toEntry("directory"))),
-    ...sortEntries([
-      ...info.files.map(toEntry("file")),
-      ...(getUploadingFiles(info.id) as LiveFileUploadState[]).map(toEntry("uploading-file")),
-    ]),
-  ]);
+  let subDirectories: DirectoryEntry[] = $state([]);
+  let files: FileEntry[] = $state([]);
+
+  $effect(() => {
+    // TODO: Fix duplicated requests
+
+    subDirectories = info.subDirectoryIds.map((id) => {
+      const info = getDirectoryInfo(id, $masterKeyStore?.get(1)?.key!);
+      return { name: get(info)?.name, info };
+    });
+    files = info.fileIds
+      .map((id): FileEntry => {
+        const info = getFileInfo(id, $masterKeyStore?.get(1)?.key!);
+        return {
+          type: "file",
+          name: get(info)?.name,
+          info,
+        };
+      })
+      .concat(
+        $fileUploadStatusStore
+          .filter((statusStore) => {
+            const { parentId, status } = get(statusStore);
+            return parentId === info.id && isFileUploading(status);
+          })
+          .map((status) => ({
+            type: "uploading-file",
+            name: get(status).name,
+            info: status,
+          })),
+      );
+
+    const sort = () => {
+      sortEntries(subDirectories, sortBy);
+      sortEntries(files, sortBy);
+    };
+    return untrack(() => {
+      sort();
+
+      const unsubscribes = subDirectories
+        .map((subDirectory) =>
+          subDirectory.info.subscribe((value) => {
+            if (subDirectory.name === value?.name) return;
+            subDirectory.name = value?.name;
+            sort();
+          }),
+        )
+        .concat(
+          files.map((file) =>
+            file.info.subscribe((value) => {
+              if (file.name === value?.name) return;
+              file.name = value?.name;
+              sort();
+            }),
+          ),
+        );
+      return () => unsubscribes.forEach((unsubscribe) => unsubscribe());
+    });
+  });
 </script>

-{#if entries.length > 0}
-  <RowVirtualizer count={entries.length} itemHeight={() => 56} itemGap={4} class="pb-[4.5rem]">
-    {#snippet item(index)}
-      {@const entry = entries[index]!}
-      {#if entry.type === "parent"}
+{#if subDirectories.length + files.length > 0 || showParentEntry}
+  <div class="space-y-1 pb-[4.5rem]">
+    {#if showParentEntry}
      <ActionEntryButton class="h-14" onclick={onParentClick}>
        <DirectoryEntryLabel type="parent-directory" name=".." />
      </ActionEntryButton>
-      {:else if entry.type === "directory"}
-        <SubDirectory
-          info={entry.details}
-          onclick={onEntryClick}
-          onOpenMenuClick={onEntryMenuClick}
-        />
-      {:else if entry.type === "file"}
-        <File info={entry.details} onclick={onEntryClick} onOpenMenuClick={onEntryMenuClick} />
-      {:else}
-        <UploadingFile state={entry.details} />
    {/if}
-    {/snippet}
-  </RowVirtualizer>
+    {#each subDirectories as { info }}
+      <SubDirectory {info} onclick={onEntryClick} onOpenMenuClick={onEntryMenuClick} />
+    {/each}
+    {#each files as file}
+      {#if file.type === "file"}
+        <File info={file.info} onclick={onEntryClick} onOpenMenuClick={onEntryMenuClick} />
+      {:else}
+        <UploadingFile status={file.info} />
+      {/if}
+    {/each}
+  </div>
 {:else}
  <div class="flex flex-grow items-center justify-center">
    <p class="text-gray-500">폴더가 비어 있어요.</p>
--- a/src/routes/(main)/directory/[[id]]/DirectoryEntries/File.svelte
+++ b/src/routes/(main)/directory/[[id]]/DirectoryEntries/File.svelte
@@ -1,52 +1,66 @@
 <script lang="ts">
-  import { browser } from "$app/environment";
+  import type { Writable } from "svelte/store";
  import { ActionEntryButton } from "$lib/components/atoms";
  import { DirectoryEntryLabel } from "$lib/components/molecules";
-  import type { SummarizedFileInfo } from "$lib/modules/filesystem";
-  import { requestFileThumbnailDownload } from "$lib/services/file";
+  import type { FileInfo } from "$lib/modules/filesystem";
  import { formatDateTime } from "$lib/utils";
+  import { requestFileThumbnailDownload } from "./service";
  import type { SelectedEntry } from "../service.svelte";

  import IconMoreVert from "~icons/material-symbols/more-vert";

  interface Props {
-    info: SummarizedFileInfo;
-    onclick: (entry: SelectedEntry) => void;
-    onOpenMenuClick: (entry: SelectedEntry) => void;
+    info: Writable<FileInfo | null>;
+    onclick: (selectedEntry: SelectedEntry) => void;
+    onOpenMenuClick: (selectedEntry: SelectedEntry) => void;
  }

  let { info, onclick, onOpenMenuClick }: Props = $props();

-  let showThumbnail = $derived(
-    browser && (info.contentType.startsWith("image/") || info.contentType.startsWith("video/")),
-  );
-  let thumbnailPromise = $derived(
-    showThumbnail ? requestFileThumbnailDownload(info.id, info.dataKey?.key) : null,
-  );
+  let thumbnail: string | undefined = $state();

-  const action = (callback: typeof onclick) => {
-    callback({ type: "file", id: info.id, dataKey: info.dataKey, name: info.name });
+  const openFile = () => {
+    const { id, dataKey, dataKeyVersion, name } = $info!;
+    if (!dataKey || !dataKeyVersion) return; // TODO: Error handling
+
+    onclick({ type: "file", id, dataKey, dataKeyVersion, name });
  };
+
+  const openMenu = () => {
+    const { id, dataKey, dataKeyVersion, name } = $info!;
+    if (!dataKey || !dataKeyVersion) return; // TODO: Error handling
+
+    onOpenMenuClick({ type: "file", id, dataKey, dataKeyVersion, name });
+  };
+
+  $effect(() => {
+    if ($info) {
+      requestFileThumbnailDownload($info.id, $info.dataKey)
+        .then((thumbnailUrl) => {
+          thumbnail = thumbnailUrl ?? undefined;
+        })
+        .catch(() => {
+          // TODO: Error Handling
+          thumbnail = undefined;
+        });
+    } else {
+      thumbnail = undefined;
+    }
+  });
 </script>

+{#if $info}
  <ActionEntryButton
    class="h-14"
-  onclick={() => action(onclick)}
+    onclick={openFile}
    actionButtonIcon={IconMoreVert}
-  onActionButtonClick={() => action(onOpenMenuClick)}
+    onActionButtonClick={openMenu}
  >
-  {#await thumbnailPromise}
    <DirectoryEntryLabel
      type="file"
-      name={info.name}
-      subtext={formatDateTime(info.createdAt ?? info.lastModifiedAt)}
+      {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>
+{/if}
--- a/src/routes/(main)/directory/[[id]]/DirectoryEntries/SubDirectory.svelte
+++ b/src/routes/(main)/directory/[[id]]/DirectoryEntries/SubDirectory.svelte
@@ -1,29 +1,44 @@
 <script lang="ts">
+  import type { Writable } from "svelte/store";
  import { ActionEntryButton } from "$lib/components/atoms";
  import { DirectoryEntryLabel } from "$lib/components/molecules";
-  import type { SubDirectoryInfo } from "$lib/modules/filesystem";
+  import type { DirectoryInfo } from "$lib/modules/filesystem";
  import type { SelectedEntry } from "../service.svelte";

  import IconMoreVert from "~icons/material-symbols/more-vert";

+  type SubDirectoryInfo = DirectoryInfo & { id: number };
+
  interface Props {
-    info: SubDirectoryInfo;
-    onclick: (entry: SelectedEntry) => void;
-    onOpenMenuClick: (entry: SelectedEntry) => void;
+    info: Writable<DirectoryInfo | null>;
+    onclick: (selectedEntry: SelectedEntry) => void;
+    onOpenMenuClick: (selectedEntry: SelectedEntry) => void;
  }

  let { info, onclick, onOpenMenuClick }: Props = $props();

-  const action = (callback: typeof onclick) => {
-    callback({ type: "directory", id: info.id, dataKey: info.dataKey, name: info.name });
+  const openDirectory = () => {
+    const { id, dataKey, dataKeyVersion, name } = $info as SubDirectoryInfo;
+    if (!dataKey || !dataKeyVersion) return; // TODO: Error handling
+
+    onclick({ type: "directory", id, dataKey, dataKeyVersion, name });
+  };
+
+  const openMenu = () => {
+    const { id, dataKey, dataKeyVersion, name } = $info as SubDirectoryInfo;
+    if (!dataKey || !dataKeyVersion) return; // TODO: Error handling
+
+    onOpenMenuClick({ type: "directory", id, dataKey, dataKeyVersion, name });
  };
 </script>

+{#if $info}
  <ActionEntryButton
    class="h-14"
-  onclick={() => action(onclick)}
+    onclick={openDirectory}
    actionButtonIcon={IconMoreVert}
-  onActionButtonClick={() => action(onOpenMenuClick)}
+    onActionButtonClick={openMenu}
  >
-  <DirectoryEntryLabel type="directory" name={info.name} />
+    <DirectoryEntryLabel type="directory" name={$info.name!} />
  </ActionEntryButton>
+{/if}
--- a/src/routes/(main)/directory/[[id]]/DirectoryEntries/UploadingFile.svelte
+++ b/src/routes/(main)/directory/[[id]]/DirectoryEntries/UploadingFile.svelte
@@ -1,37 +1,38 @@
 <script lang="ts">
-  import type { LiveFileUploadState } from "$lib/modules/file";
+  import type { Writable } from "svelte/store";
+  import { isFileUploading, type FileUploadStatus } from "$lib/stores";
  import { formatNetworkSpeed } from "$lib/utils";

  import IconDraft from "~icons/material-symbols/draft";

  interface Props {
-    state: LiveFileUploadState;
+    status: Writable<FileUploadStatus>;
  }

-  let { state }: Props = $props();
+  let { status }: Props = $props();
 </script>

+{#if isFileUploading($status.status)}
  <div class="flex h-14 gap-x-4 p-2">
    <div class="flex h-10 w-10 flex-shrink-0 items-center justify-center text-xl">
      <IconDraft class="text-gray-600" />
    </div>
    <div class="flex flex-grow flex-col overflow-hidden text-gray-800">
-    <p title={state.name} class="truncate font-medium">
-      {state.name}
+      <p title={$status.name} class="truncate font-medium">
+        {$status.name}
      </p>
      <p class="text-xs">
-      {#if state.status === "queued"}
-        대기 중
-      {:else if state.status === "encryption-pending"}
+        {#if $status.status === "encryption-pending"}
          준비 중
-      {:else if state.status === "encrypting"}
+        {:else if $status.status === "encrypting"}
          암호화하는 중
-      {:else if state.status === "upload-pending"}
+        {:else if $status.status === "upload-pending"}
          업로드를 기다리는 중
-      {:else if state.status === "uploading"}
-        전송됨 {Math.floor((state.progress ?? 0) * 100)}% ·
-        {formatNetworkSpeed((state.rate ?? 0) * 8)}
+        {:else if $status.status === "uploading"}
+          전송됨 {Math.floor(($status.progress ?? 0) * 100)}% ·
+          {formatNetworkSpeed(($status.rate ?? 0) * 8)}
        {/if}
      </p>
    </div>
  </div>
+{/if}
--- a/src/routes/(main)/directory/[[id]]/DirectoryEntries/service.ts
+++ b/src/routes/(main)/directory/[[id]]/DirectoryEntries/service.ts
@@ -0,0 +1 @@
+export { requestFileThumbnailDownload } from "$lib/services/file";
--- a/src/routes/(main)/directory/[[id]]/DownloadStatusCard.svelte
+++ b/src/routes/(main)/directory/[[id]]/DownloadStatusCard.svelte
@@ -1,5 +1,7 @@
 <script lang="ts">
-  import { getDownloadingFiles } from "$lib/modules/file";
+  import { untrack } from "svelte";
+  import { get, type Writable } from "svelte/store";
+  import { fileDownloadStatusStore, isFileDownloading, type FileDownloadStatus } from "$lib/stores";

  interface Props {
    onclick: () => void;
@@ -7,7 +9,23 @@

  let { onclick }: Props = $props();

-  let downloadingFiles = $derived(getDownloadingFiles());
+  let downloadingFiles: Writable<FileDownloadStatus>[] = $state([]);
+
+  $effect(() => {
+    downloadingFiles = $fileDownloadStatusStore.filter((status) =>
+      isFileDownloading(get(status).status),
+    );
+    return untrack(() => {
+      const unsubscribes = downloadingFiles.map((downloadingFile) =>
+        downloadingFile.subscribe(({ status }) => {
+          if (!isFileDownloading(status)) {
+            downloadingFiles = downloadingFiles.filter((file) => file !== downloadingFile);
+          }
+        }),
+      );
+      return () => unsubscribes.forEach((unsubscribe) => unsubscribe());
+    });
+  });
 </script>

 {#if downloadingFiles.length > 0}
--- a/src/routes/(main)/directory/[[id]]/UploadStatusCard.svelte
+++ b/src/routes/(main)/directory/[[id]]/UploadStatusCard.svelte
@@ -1,5 +1,7 @@
 <script lang="ts">
-  import { getUploadingFiles } from "$lib/modules/file";
+  import { untrack } from "svelte";
+  import { get, type Writable } from "svelte/store";
+  import { fileUploadStatusStore, isFileUploading, type FileUploadStatus } from "$lib/stores";

  interface Props {
    onclick: () => void;
@@ -7,7 +9,21 @@

  let { onclick }: Props = $props();

-  let uploadingFiles = $derived(getUploadingFiles());
+  let uploadingFiles: Writable<FileUploadStatus>[] = $state([]);
+
+  $effect(() => {
+    uploadingFiles = $fileUploadStatusStore.filter((status) => isFileUploading(get(status).status));
+    return untrack(() => {
+      const unsubscribes = uploadingFiles.map((uploadingFile) =>
+        uploadingFile.subscribe(({ status }) => {
+          if (!isFileUploading(status)) {
+            uploadingFiles = uploadingFiles.filter((file) => file !== uploadingFile);
+          }
+        }),
+      );
+      return () => unsubscribes.forEach((unsubscribe) => unsubscribe());
+    });
+  });
 </script>

 {#if uploadingFiles.length > 0}
--- a/src/routes/(main)/directory/[[id]]/service.svelte.ts
+++ b/src/routes/(main)/directory/[[id]]/service.svelte.ts
@@ -8,14 +8,14 @@ import {
  deleteFileThumbnailCache,
  uploadFile,
 } from "$lib/modules/file";
-import type { DataKey } from "$lib/modules/filesystem";
 import { hmacSecretStore, type MasterKey, type HmacSecret } from "$lib/stores";
 import { trpc } from "$trpc/client";

 export interface SelectedEntry {
  type: "directory" | "file";
  id: number;
-  dataKey: DataKey | undefined;
+  dataKey: CryptoKey;
+  dataKeyVersion: Date;
  name: string;
 }

@@ -97,25 +97,20 @@ export const requestFileUpload = async (
 };

 export const requestEntryRename = async (entry: SelectedEntry, newName: string) => {
-  if (!entry.dataKey) {
-    // TODO: Error Handling
-    return false;
-  }
-
-  const newNameEncrypted = await encryptString(newName, entry.dataKey.key);
+  const newNameEncrypted = await encryptString(newName, entry.dataKey);

  try {
    if (entry.type === "directory") {
      await trpc().directory.rename.mutate({
        id: entry.id,
-        dekVersion: entry.dataKey.version,
+        dekVersion: entry.dataKeyVersion,
        name: newNameEncrypted.ciphertext,
        nameIv: newNameEncrypted.iv,
      });
    } else {
      await trpc().file.rename.mutate({
        id: entry.id,
-        dekVersion: entry.dataKey.version,
+        dekVersion: entry.dataKeyVersion,
        name: newNameEncrypted.ciphertext,
        nameIv: newNameEncrypted.iv,
      });
--- a/src/routes/(main)/home/+page.svelte
+++ b/src/routes/(main)/home/+page.svelte
@@ -1,23 +1,17 @@
 <script lang="ts">
-  import { onMount } from "svelte";
+  import type { Writable } from "svelte/store";
  import { goto } from "$app/navigation";
  import { EntryButton, FileThumbnailButton } from "$lib/components/atoms";
-  import { bulkGetFileInfo, type MaybeFileInfo } from "$lib/modules/filesystem";
+  import { getFileInfo, type FileInfo } from "$lib/modules/filesystem";
  import { masterKeyStore } from "$lib/stores";
  import { requestFreshMediaFilesRetrieval } from "./service";

-  let mediaFiles: MaybeFileInfo[] = $state([]);
+  let mediaFiles: Writable<FileInfo | null>[] = $state([]);

-  onMount(async () => {
-    const files = await requestFreshMediaFilesRetrieval();
-    mediaFiles = Array.from(
-      (
-        await bulkGetFileInfo(
-          files.map(({ id }) => id),
-          $masterKeyStore?.get(1)?.key!,
-        )
-      ).values(),
-    );
+  $effect(() => {
+    requestFreshMediaFilesRetrieval().then((files) => {
+      mediaFiles = files.map(({ id }) => getFileInfo(id, $masterKeyStore?.get(1)?.key!));
+    });
  });
 </script>

@@ -27,18 +21,14 @@

 <div class="min-h-full space-y-4 bg-gray-100 px-4 pb-[5.5em] pt-4">
  <p class="px-2 text-2xl font-bold text-gray-800">ArkVault</p>
-  <div class="rounded-xl bg-white p-2">
+  <div class="space-y-2 rounded-xl bg-white px-2 pb-4 pt-2">
    <EntryButton onclick={() => goto("/gallery")} class="w-full">
      <p class="text-left font-semibold">사진 및 동영상</p>
    </EntryButton>
-    {#if mediaFiles.length > 0}
-      <div class="grid grid-cols-4 gap-2 p-2">
-        {#each mediaFiles as file (file.id)}
-          {#if file.exists}
+    <div class="grid grid-cols-4 gap-2 px-2">
+      {#each mediaFiles as file}
        <FileThumbnailButton info={file} onclick={({ id }) => goto(`/file/${id}`)} />
-          {/if}
      {/each}
    </div>
-    {/if}
  </div>
 </div>
--- a/src/routes/(main)/menu/+page.server.ts
+++ b/src/routes/(main)/menu/+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 { nickname } = await createCaller(event).user.get();
-  return { nickname };
-};
--- a/src/routes/(main)/menu/+page.ts
+++ b/src/routes/(main)/menu/+page.ts
@@ -0,0 +1,7 @@
+import { trpc } from "$trpc/client";
+import type { PageLoad } from "./$types";
+
+export const load: PageLoad = async ({ fetch }) => {
+  const { nickname } = await trpc(fetch).user.get.query();
+  return { nickname };
+};
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,14 +1,24 @@
 <script lang="ts">
  import { onMount } from "svelte";
+  import { get } from "svelte/store";
  import { goto as svelteGoto } from "$app/navigation";
-  import { getDownloadingFiles, getUploadingFiles } from "$lib/modules/file";
-  import { clientKeyStore, masterKeyStore } from "$lib/stores";
+  import {
+    fileUploadStatusStore,
+    fileDownloadStatusStore,
+    isFileUploading,
+    isFileDownloading,
+    clientKeyStore,
+    masterKeyStore,
+  } from "$lib/stores";
  import "../app.css";

  let { children } = $props();

  const protectFileUploadAndDownload = (e: BeforeUnloadEvent) => {
-    if (getDownloadingFiles().length > 0 || getUploadingFiles().length > 0) {
+    if (
+      $fileUploadStatusStore.some((status) => isFileUploading(get(status).status)) ||
+      $fileDownloadStatusStore.some((status) => isFileDownloading(get(status).status))
+    ) {
      e.preventDefault();
    }
  };
--- a/src/routes/api/trpc/[trpc]/+server.ts
+++ b/src/routes/api/trpc/[trpc]/+server.ts
@@ -6,7 +6,6 @@ import type { RequestHandler } from "./$types";
 const trpcHandler: RequestHandler = (event) =>
  fetchRequestHandler({
    endpoint: "/api/trpc",
-    allowMethodOverride: true,
    req: event.request,
    router: appRouter,
    createContext: () => createContext(event),
--- a/src/trpc/client.ts
+++ b/src/trpc/client.ts
@@ -1,4 +1,4 @@
-import { createTRPCClient, httpBatchLink, TRPCClientError } from "@trpc/client";
+import { createTRPCClient, httpBatchLink } from "@trpc/client";
 import superjson from "superjson";
 import { browser } from "$app/environment";
 import type { AppRouter } from "./router.server";
@@ -9,7 +9,6 @@ const createClient = (fetch: typeof globalThis.fetch) =>
      httpBatchLink({
        url: "/api/trpc",
        maxURLLength: 4096,
-        methodOverride: "POST",
        transformer: superjson,
        fetch,
      }),
@@ -25,7 +24,3 @@ export const trpc = (fetch = globalThis.fetch) => {
  }
  return client;
 };
-
-export const isTRPCClientError = (e: unknown): e is TRPCClientError<AppRouter> => {
-  return e instanceof TRPCClientError;
-};
--- a/src/trpc/routers/category.ts
+++ b/src/trpc/routers/category.ts
@@ -9,7 +9,6 @@ const categoryRouter = router({
    .input(
      z.object({
        id: categoryIdSchema,
-        recurse: z.boolean().default(false),
      }),
    )
    .query(async ({ ctx, input }) => {
@@ -21,12 +20,7 @@ const categoryRouter = router({
        throw new TRPCError({ code: "NOT_FOUND", message: "Invalid category id" });
      }

-      const [categories, files] = await Promise.all([
-        CategoryRepo.getAllCategoriesByParent(ctx.session.userId, input.id),
-        input.id !== "root"
-          ? FileRepo.getAllFilesByCategory(ctx.session.userId, input.id, input.recurse)
-          : undefined,
-      ]);
+      const categories = await CategoryRepo.getAllCategoriesByParent(ctx.session.userId, input.id);
      return {
        metadata: category && {
          parent: category.parentId,
@@ -36,28 +30,7 @@ const categoryRouter = router({
          name: category.encName.ciphertext,
          nameIv: category.encName.iv,
        },
-        subCategories: categories.map((category) => ({
-          id: category.id,
-          mekVersion: category.mekVersion,
-          dek: category.encDek,
-          dekVersion: category.dekVersion,
-          name: category.encName.ciphertext,
-          nameIv: category.encName.iv,
-        })),
-        files: files?.map((file) => ({
-          id: file.id,
-          mekVersion: file.mekVersion,
-          dek: file.encDek,
-          dekVersion: file.dekVersion,
-          contentType: file.contentType,
-          name: file.encName.ciphertext,
-          nameIv: file.encName.iv,
-          createdAt: file.encCreatedAt?.ciphertext,
-          createdAtIv: file.encCreatedAt?.iv,
-          lastModifiedAt: file.encLastModifiedAt.ciphertext,
-          lastModifiedAtIv: file.encLastModifiedAt.iv,
-          isRecursive: file.isRecursive,
-        })),
+        subCategories: categories.map(({ id }) => id),
      };
    }),

@@ -140,6 +113,27 @@ const categoryRouter = router({
      }
    }),

+  files: roleProcedure["activeClient"]
+    .input(
+      z.object({
+        id: z.int().positive(),
+        recurse: z.boolean().default(false),
+      }),
+    )
+    .query(async ({ ctx, input }) => {
+      const category = await CategoryRepo.getCategory(ctx.session.userId, input.id);
+      if (!category) {
+        throw new TRPCError({ code: "NOT_FOUND", message: "Invalid category id" });
+      }
+
+      const files = await FileRepo.getAllFilesByCategory(
+        ctx.session.userId,
+        input.id,
+        input.recurse,
+      );
+      return files.map(({ id, isRecursive }) => ({ file: id, isRecursive }));
+    }),
+
  addFile: roleProcedure["activeClient"]
    .input(
      z.object({
--- a/src/trpc/routers/directory.ts
+++ b/src/trpc/routers/directory.ts
@@ -32,27 +32,8 @@ const directoryRouter = router({
          name: directory.encName.ciphertext,
          nameIv: directory.encName.iv,
        },
-        subDirectories: directories.map((directory) => ({
-          id: directory.id,
-          mekVersion: directory.mekVersion,
-          dek: directory.encDek,
-          dekVersion: directory.dekVersion,
-          name: directory.encName.ciphertext,
-          nameIv: directory.encName.iv,
-        })),
-        files: files.map((file) => ({
-          id: file.id,
-          mekVersion: file.mekVersion,
-          dek: file.encDek,
-          dekVersion: file.dekVersion,
-          contentType: file.contentType,
-          name: file.encName.ciphertext,
-          nameIv: file.encName.iv,
-          createdAt: file.encCreatedAt?.ciphertext,
-          createdAtIv: file.encCreatedAt?.iv,
-          lastModifiedAt: file.encLastModifiedAt.ciphertext,
-          lastModifiedAtIv: file.encLastModifiedAt.iv,
-        })),
+        subDirectories: directories.map(({ id }) => id),
+        files: files.map(({ id }) => id),
      };
    }),

--- a/src/trpc/routers/file.ts
+++ b/src/trpc/routers/file.ts
@@ -31,50 +31,10 @@ const fileRouter = router({
        createdAtIv: file.encCreatedAt?.iv,
        lastModifiedAt: file.encLastModifiedAt.ciphertext,
        lastModifiedAtIv: file.encLastModifiedAt.iv,
-        categories: categories.map((category) => ({
-          id: category.id,
-          mekVersion: category.mekVersion,
-          dek: category.encDek,
-          dekVersion: category.dekVersion,
-          name: category.encName.ciphertext,
-          nameIv: category.encName.iv,
-        })),
+        categories: categories.map(({ id }) => id),
      };
    }),

-  bulkGet: roleProcedure["activeClient"]
-    .input(
-      z.object({
-        ids: z.number().positive().array(),
-      }),
-    )
-    .query(async ({ ctx, input }) => {
-      const files = await FileRepo.getFilesWithCategories(ctx.session.userId, input.ids);
-      return files.map((file) => ({
-        id: file.id,
-        parent: file.parentId,
-        mekVersion: file.mekVersion,
-        dek: file.encDek,
-        dekVersion: file.dekVersion,
-        contentType: file.contentType,
-        contentIv: file.encContentIv,
-        name: file.encName.ciphertext,
-        nameIv: file.encName.iv,
-        createdAt: file.encCreatedAt?.ciphertext,
-        createdAtIv: file.encCreatedAt?.iv,
-        lastModifiedAt: file.encLastModifiedAt.ciphertext,
-        lastModifiedAtIv: file.encLastModifiedAt.iv,
-        categories: file.categories.map((category) => ({
-          id: category.id,
-          mekVersion: category.mekVersion,
-          dek: category.encDek,
-          dekVersion: category.dekVersion,
-          name: category.encName.ciphertext,
-          nameIv: category.encName.iv,
-        })),
-      }));
-    }),
-
  list: roleProcedure["activeClient"].query(async ({ ctx }) => {
    return await FileRepo.getAllFileIds(ctx.session.userId);
  }),
Author	SHA1	Message	Date
static	90ac5ba4c3	Merge pull request #15 from kmc7468/dev v0.6.0	2025-12-27 14:22:26 +09:00
static	dfffa004ac	Merge pull request #13 from kmc7468/dev v0.5.1	2025-07-12 19:56:12 +09:00
static	0cd55a413d	Merge pull request #12 from kmc7468/dev v0.5.0	2025-07-12 06:01:08 +09:00
static	361d966a59	Merge pull request #10 from kmc7468/dev v0.4.0	2025-01-30 21:06:50 +09:00
static	aef43b8bfa	Merge pull request #6 from kmc7468/dev v0.3.0	2025-01-18 13:29:09 +09:00
static	7f128cccf6	Merge pull request #5 from kmc7468/dev v0.2.0	2025-01-13 03:53:14 +09:00
static	a198e5f6dc	Merge pull request #2 from kmc7468/dev v0.1.0	2025-01-09 06:24:31 +09:00
				`@@ -0,0 +1 @@`
				`export { requestFileThumbnailDownload } from "$lib/services/file";`