Merge pull request #10 from kmc7468/dev

v0.4.0

.dockerignore

@@ -1,6 +1,5 @@
 .git
 node_modules
-/Makefile
 
 # Output
 .output
@@ -11,15 +10,13 @@ node_modules
 /build
 /data
 /library
-/thumbnails
 
 # OS
 .DS_Store
 Thumbs.db
 
-# Editors
+# VSCode
 /.vscode
-/.idea
 
 # Env
 .env

.env.example

@@ -11,4 +11,3 @@ SESSION_EXPIRES=
 USER_CLIENT_CHALLENGE_EXPIRES=
 SESSION_UPGRADE_CHALLENGE_EXPIRES=
 LIBRARY_PATH=
-THUMBNAILS_PATH=

.gitignore

@@ -9,15 +9,13 @@ node_modules
 /build
 /data
 /library
-/thumbnails
 
 # OS
 .DS_Store
 Thumbs.db
 
-# Editors
+# VSCode
 /.vscode
-/.idea
 
 # Env
 .env

docker-compose.dev.yaml

@@ -1,7 +1,7 @@
 services:
   database:
-    image: postgres:17
+    image: postgres:17.2
-    restart: always
+    restart: on-failure
     volumes:
       - database:/var/lib/postgresql/data
     environment:

docker-compose.yaml

@@ -1,13 +1,12 @@
 services:
   server:
     build: .
-    restart: unless-stopped
+    restart: on-failure
     depends_on:
       - database
     user: ${CONTAINER_UID:-0}:${CONTAINER_GID:-0}
     volumes:
       - ./data/library:/app/data/library
-      - ./data/thumbnails:/app/data/thumbnails
     environment:
       # ArkVault
       - DATABASE_HOST=database
@@ -18,7 +17,6 @@ services:
       - USER_CLIENT_CHALLENGE_EXPIRES
       - SESSION_UPGRADE_CHALLENGE_EXPIRES
       - LIBRARY_PATH=/app/data/library
-      - THUMBNAILS_PATH=/app/data/thumbnails
       # SvelteKit
       - ADDRESS_HEADER=${TRUST_PROXY:+X-Forwarded-For}
       - XFF_DEPTH=${TRUST_PROXY:-}
@@ -27,8 +25,8 @@ services:
       - ${PORT:-80}:3000
 
   database:
-    image: postgres:17-alpine
+    image: postgres:17.2-alpine
-    restart: unless-stopped
+    restart: on-failure
     user: ${CONTAINER_UID:-0}:${CONTAINER_GID:-0}
     volumes:
       - ./data/database:/var/lib/postgresql/data

eslint.config.js

@@ -1,13 +1,11 @@
-import { includeIgnoreFile } from "@eslint/compat";
-import js from "@eslint/js";
-import svelteQuery from "@tanstack/eslint-plugin-query";
 import prettier from "eslint-config-prettier";
+import js from "@eslint/js";
+import { includeIgnoreFile } from "@eslint/compat";
 import svelte from "eslint-plugin-svelte";
 import tailwind from "eslint-plugin-tailwindcss";
 import globals from "globals";
+import { fileURLToPath } from "node:url";
 import ts from "typescript-eslint";
-import { fileURLToPath } from "url";
-
 const gitignorePath = fileURLToPath(new URL("./.gitignore", import.meta.url));
 
 export default ts.config(
@@ -28,11 +26,11 @@ export default ts.config(
   },
   {
     files: ["**/*.svelte"],
+
     languageOptions: {
       parserOptions: {
         parser: ts.parser,
       },
     },
   },
-  ...svelteQuery.configs["flat/recommended"],
 );

package.json

@@ -1,7 +1,7 @@
 {
   "name": "arkvault",
   "private": true,
-  "version": "0.5.1",
+  "version": "0.4.0",
   "type": "module",
   "scripts": {
     "dev": "vite dev",
@@ -16,52 +16,49 @@
     "db:migrate": "kysely migrate"
   },
   "devDependencies": {
-    "@eslint/compat": "^1.3.1",
+    "@eslint/compat": "^1.2.4",
-    "@iconify-json/material-symbols": "^1.2.29",
+    "@iconify-json/material-symbols": "^1.2.12",
-    "@sveltejs/adapter-node": "^5.2.13",
+    "@sveltejs/adapter-node": "^5.2.11",
-    "@sveltejs/kit": "^2.22.5",
+    "@sveltejs/kit": "^2.15.2",
     "@sveltejs/vite-plugin-svelte": "^4.0.4",
-    "@tanstack/eslint-plugin-query": "^5.81.2",
-    "@tanstack/svelte-query": "^5.83.0",
     "@types/file-saver": "^2.0.7",
     "@types/ms": "^0.7.34",
-    "@types/node-schedule": "^2.1.8",
+    "@types/node-schedule": "^2.1.7",
-    "@types/pg": "^8.15.4",
+    "@types/pg": "^8.11.10",
-    "autoprefixer": "^10.4.21",
+    "autoprefixer": "^10.4.20",
-    "axios": "^1.10.0",
+    "axios": "^1.7.9",
-    "dexie": "^4.0.11",
+    "dexie": "^4.0.10",
-    "eslint": "^9.30.1",
+    "eslint": "^9.17.0",
-    "eslint-config-prettier": "^10.1.5",
+    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-svelte": "^3.10.1",
+    "eslint-plugin-svelte": "^2.46.1",
-    "eslint-plugin-tailwindcss": "^3.18.0",
+    "eslint-plugin-tailwindcss": "^3.17.5",
-    "exifreader": "^4.31.1",
+    "exifreader": "^4.26.0",
     "file-saver": "^2.0.5",
-    "globals": "^16.3.0",
+    "globals": "^15.14.0",
     "heic2any": "^0.0.4",
-    "kysely-ctl": "^0.13.1",
+    "kysely-ctl": "^0.10.1",
-    "lru-cache": "^11.1.0",
+    "mime": "^4.0.6",
-    "mime": "^4.0.7",
     "p-limit": "^6.2.0",
-    "prettier": "^3.6.2",
+    "prettier": "^3.4.2",
-    "prettier-plugin-svelte": "^3.4.0",
+    "prettier-plugin-svelte": "^3.3.2",
-    "prettier-plugin-tailwindcss": "^0.6.14",
+    "prettier-plugin-tailwindcss": "^0.6.9",
-    "svelte": "^5.35.6",
+    "svelte": "^5.19.1",
-    "svelte-check": "^4.2.2",
+    "svelte-check": "^4.1.3",
     "tailwindcss": "^3.4.17",
-    "typescript": "^5.8.3",
+    "typescript": "^5.7.3",
-    "typescript-eslint": "^8.36.0",
+    "typescript-eslint": "^8.19.1",
-    "unplugin-icons": "^22.1.0",
+    "unplugin-icons": "^0.22.0",
-    "vite": "^5.4.19"
+    "vite": "^5.4.11"
   },
   "dependencies": {
     "@fastify/busboy": "^3.1.1",
-    "argon2": "^0.43.0",
+    "argon2": "^0.41.1",
-    "kysely": "^0.28.2",
+    "kysely": "^0.27.5",
     "ms": "^2.1.3",
     "node-schedule": "^2.1.1",
-    "pg": "^8.16.3",
+    "pg": "^8.13.1",
-    "uuid": "^11.1.0",
+    "uuid": "^11.0.4",
-    "zod": "^3.25.76"
+    "zod": "^3.24.1"
   },
   "engines": {
     "node": "^22.0.0",

src/hooks.client.ts

@@ -4,15 +4,6 @@ import { prepareFileCache } from "$lib/modules/file";
 import { prepareOpfs } from "$lib/modules/opfs";
 import { clientKeyStore, masterKeyStore, hmacSecretStore } from "$lib/stores";
 
-const requestPersistentStorage = async () => {
-  const isPersistent = await navigator.storage.persist();
-  if (isPersistent) {
-    console.log("[ArkVault] Persistent storage granted.");
-  } else {
-    console.warn("[ArkVault] Persistent storage not granted.");
-  }
-};
-
 const prepareClientKeyStore = async () => {
   const [encryptKey, decryptKey, signKey, verifyKey] = await Promise.all([
     getClientKey("encrypt"),
@@ -41,7 +32,6 @@ const prepareHmacSecretStore = async () => {
 
 export const init: ClientInit = async () => {
   await Promise.all([
-    requestPersistentStorage(),
     prepareFileCache(),
     prepareClientKeyStore(),
     prepareMasterKeyStore(),

src/lib/components/atoms/divs/FullscreenDiv.svelte

@@ -1,15 +1,7 @@
 <script lang="ts">
-  import type { Snippet } from "svelte";
+  let { children } = $props();
-  import type { ClassValue } from "svelte/elements";
-
-  interface Props {
-    children: Snippet;
-    class?: ClassValue;
-  }
-
-  let { children, class: className }: Props = $props();
 </script>
 
-<div class={["flex flex-grow flex-col justify-between px-4", className]}>
+<div class="flex flex-grow flex-col justify-between px-4">
   {@render children()}
 </div>

src/lib/components/molecules/ActionModal.svelte

@@ -12,7 +12,6 @@
     confirmText: string;
     isOpen: boolean;
     onbeforeclose?: () => void;
-    oncancel?: () => void;
     onConfirmClick: ConfirmHandler;
     title: string;
   }
@@ -23,7 +22,6 @@
     confirmText,
     isOpen = $bindable(),
     onbeforeclose,
-    oncancel,
     onConfirmClick,
     title,
   }: Props = $props();
@@ -33,11 +31,6 @@
     isOpen = false;
   };
 
-  const cancelAction = () => {
-    oncancel?.();
-    closeModal();
-  };
-
   const confirmAction = async () => {
     if ((await onConfirmClick()) !== false) {
       closeModal();
@@ -45,13 +38,13 @@
   };
 </script>
 
-<Modal bind:isOpen onclose={cancelAction} class="space-y-4">
+<Modal bind:isOpen onclose={closeModal} class="space-y-4">
   <div class="flex flex-col gap-y-2 break-keep">
     <p class="text-xl font-bold">{title}</p>
     {@render children()}
   </div>
   <div class="flex gap-x-2">
-    <Button color="gray" onclick={cancelAction} class="flex-1">{cancelText}</Button>
+    <Button color="gray" onclick={closeModal} class="flex-1">{cancelText}</Button>
     <Button onclick={confirmAction} class="flex-1">{confirmText}</Button>
   </div>
 </Modal>

src/lib/components/molecules/Categories/Categories.svelte

@@ -1,16 +1,14 @@
 <script lang="ts">
-  import type { Component } from "svelte";
+  import { untrack, type Component } from "svelte";
   import type { SvelteHTMLElements } from "svelte/elements";
-  import { derived } from "svelte/store";
+  import { get, type Writable } from "svelte/store";
-  import type { CategoryId } from "$lib/indexedDB";
+  import type { CategoryInfo } from "$lib/modules/filesystem";
-  import { getCategoryInfo, type SubCategoryInfo } from "$lib/modules/filesystem2";
   import { SortBy, sortEntries } from "$lib/modules/util";
-  import { masterKeyStore } from "$lib/stores";
   import Category from "./Category.svelte";
   import type { SelectedCategory } from "./service";
 
   interface Props {
-    categoryIds: CategoryId[];
+    categories: Writable<CategoryInfo | null>[];
     categoryMenuIcon?: Component<SvelteHTMLElements["svg"]>;
     onCategoryClick: (category: SelectedCategory) => void;
     onCategoryMenuClick?: (category: SelectedCategory) => void;
@@ -18,33 +16,42 @@
   }
 
   let {
-    categoryIds,
+    categories,
     categoryMenuIcon,
     onCategoryClick,
     onCategoryMenuClick,
     sortBy = SortBy.NAME_ASC,
   }: Props = $props();
 
-  let categories = $derived(
+  let categoriesWithName: { name?: string; info: Writable<CategoryInfo | null> }[] = $state([]);
-    derived(
+
-      categoryIds.map((id) => getCategoryInfo(id, $masterKeyStore?.get(1)?.key!)),
+  $effect(() => {
-      (infos) => {
+    categoriesWithName = categories.map((category) => ({
-        const categories = infos
+      name: get(category)?.name,
-          .filter(($info) => $info.status === "success")
+      info: category,
-          .map(($info) => ({
-            name: $info.data.name,
-            info: $info.data as SubCategoryInfo,
     }));
-        sortEntries(categories, sortBy);
+
-        return categories;
+    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 $categories.length > 0}
+{#if categoriesWithName.length > 0}
   <div class="space-y-1">
-    {#each $categories as { info }}
+    {#each categoriesWithName as { info }}
       <Category
         {info}
         menuIcon={categoryMenuIcon}

src/lib/components/molecules/Categories/Category.svelte

@@ -1,13 +1,14 @@
 <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 { SubCategoryInfo } from "$lib/modules/filesystem2";
+  import type { CategoryInfo } from "$lib/modules/filesystem";
   import type { SelectedCategory } from "./service";
 
   interface Props {
-    info: SubCategoryInfo;
+    info: Writable<CategoryInfo | null>;
     menuIcon?: Component<SvelteHTMLElements["svg"]>;
     onclick: (category: SelectedCategory) => void;
     onMenuClick?: (category: SelectedCategory) => void;
@@ -16,25 +17,27 @@
   let { info, menuIcon, onclick, onMenuClick }: Props = $props();
 
   const openCategory = () => {
-    const { id, dataKey, dataKeyVersion, name } = info;
+    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;
+    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} />
+    <CategoryLabel name={$info.name!} />
   </ActionEntryButton>
+{/if}

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/filesystem2";
+  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]}>
@@ -45,7 +55,7 @@
   {/if}
   {#key info}
     <Categories
-      categoryIds={info.subCategoryIds}
+      categories={subCategories}
       categoryMenuIcon={subCategoryMenuIcon}
       onCategoryClick={onSubCategoryClick}
       onCategoryMenuClick={onSubCategoryMenuClick}

src/lib/components/molecules/labels/DirectoryEntryLabel.svelte

@@ -10,38 +10,19 @@
     name: string;
     subtext?: string;
     textClass?: ClassValue;
-    thumbnail?: string;
     type: "directory" | "file";
   }
 
-  let {
+  let { class: className, name, subtext, textClass: textClassName, type }: Props = $props();
-    class: className,
-    name,
-    subtext,
-    textClass: textClassName,
-    thumbnail,
-    type,
-  }: Props = $props();
 </script>
 
-{#snippet iconSnippet()}
-  <div class="flex h-10 w-10 items-center justify-center text-xl">
-    {#if thumbnail}
-      <img src={thumbnail} alt={name} loading="lazy" class="aspect-square rounded object-cover" />
-    {:else if type === "directory"}
-      <IconFolder />
-    {:else}
-      <IconDraft class="text-blue-400" />
-    {/if}
-  </div>
-{/snippet}
-
 {#snippet subtextSnippet()}
   {subtext}
 {/snippet}
 
 <IconLabel
-  {iconSnippet}
+  icon={type === "directory" ? IconFolder : IconDraft}
+  iconClass={type === "file" ? "text-blue-400" : undefined}
   subtext={subtext ? subtextSnippet : undefined}
   class={className}
   textClass={textClassName}

src/lib/components/molecules/labels/IconLabel.svelte

@@ -5,9 +5,8 @@
   interface Props {
     children: Snippet;
     class?: ClassValue;
-    icon?: Component<SvelteHTMLElements["svg"]>;
+    icon: Component<SvelteHTMLElements["svg"]>;
     iconClass?: ClassValue;
-    iconSnippet?: Snippet;
     subtext?: Snippet;
     textClass?: ClassValue;
   }
@@ -17,22 +16,15 @@
     class: className,
     icon: Icon,
     iconClass: iconClassName,
-    iconSnippet,
     subtext,
     textClass: textClassName,
   }: Props = $props();
 </script>
 
 <div class={["flex items-center gap-x-4", className]}>
-  {#if iconSnippet}
-    <div class={["flex-shrink-0", iconClassName]}>
-      {@render iconSnippet()}
-    </div>
-  {:else if Icon}
   <div class={["flex-shrink-0 text-lg", iconClassName]}>
     <Icon />
   </div>
-  {/if}
   <div class="flex flex-grow flex-col overflow-x-hidden text-left">
     <p class={["truncate font-medium", textClassName]}>
       {@render children()}

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

@@ -1,8 +1,9 @@
 <script lang="ts">
-  import { derived } from "svelte/store";
+  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 { getFileInfo, type CategoryInfo } from "$lib/modules/filesystem2";
+  import { getFileInfo, type FileInfo, type CategoryInfo } from "$lib/modules/filesystem";
   import { SortBy, sortEntries } from "$lib/modules/util";
   import { masterKeyStore } from "$lib/stores";
   import File from "./File.svelte";
@@ -18,7 +19,7 @@
     onSubCategoryCreateClick: () => void;
     onSubCategoryMenuClick: (subCategory: SelectedCategory) => void;
     sortBy?: SortBy;
-    isFileRecursive?: boolean;
+    isFileRecursive: boolean;
   }
 
   let {
@@ -32,35 +33,39 @@
     isFileRecursive = $bindable(),
   }: Props = $props();
 
-  let fileInfos = $derived(
+  let files: { name?: string; info: Writable<FileInfo | null>; isRecursive: boolean }[] = $state(
+    [],
+  );
+
+  $effect(() => {
+    files =
       info.files
         ?.filter(({ isRecursive }) => isFileRecursive || !isRecursive)
-      .map(({ id, isRecursive }) => ({
+        .map(({ id, isRecursive }) => {
-        info: getFileInfo(id, $masterKeyStore?.get(1)?.key!),
+          const info = getFileInfo(id, $masterKeyStore?.get(1)?.key!);
-        isRecursive,
-      })) ?? [],
-  );
-  let files = $derived(
-    derived(
-      fileInfos.map(({ info }) => info),
-      (infos) => {
-        const files = infos
-          .map(($info, i) => {
-            if ($info.status === "success") {
           return {
-                name: $info.data.name,
+            name: get(info)?.name,
-                isRecursive: fileInfos[i]!.isRecursive,
+            info,
-                info: $info.data,
+            isRecursive,
           };
-            }
+        }) ?? [];
-            return undefined;
+
-          })
+    const sort = () => {
-          .filter((info) => info !== undefined);
       sortEntries(files, sortBy);
-        return files;
+    };
-      },
+    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>
 
 <div class="space-y-4">
@@ -80,15 +85,13 @@
     <div class="space-y-4 bg-white p-4">
       <div class="flex items-center justify-between">
         <p class="text-lg font-bold text-gray-800">파일</p>
-        {#if isFileRecursive !== undefined}
         <CheckBox bind:checked={isFileRecursive}>
           <p class="font-medium">하위 카테고리의 파일</p>
         </CheckBox>
-        {/if}
       </div>
       <div class="space-y-1">
         {#key info}
-          {#each $files as { info, isRecursive }}
+          {#each files as { info, isRecursive }}
             <File
               {info}
               onclick={onFileClick}

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

@@ -1,56 +1,42 @@
 <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/filesystem2";
+  import type { FileInfo } from "$lib/modules/filesystem";
-  import { requestFileThumbnailDownload, type SelectedFile } from "./service";
+  import type { SelectedFile } from "./service";
 
   import IconClose from "~icons/material-symbols/close";
 
   interface Props {
-    info: FileInfo;
+    info: Writable<FileInfo | null>;
     onclick: (selectedFile: SelectedFile) => void;
     onRemoveClick?: (selectedFile: SelectedFile) => void;
   }
 
   let { info, onclick, onRemoveClick }: Props = $props();
 
-  let thumbnail: string | undefined = $state();
-
   const openFile = () => {
-    const { id, dataKey, dataKeyVersion, name } = info;
+    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;
+    const { id, dataKey, dataKeyVersion, name } = $info as FileInfo;
     if (!dataKey || !dataKeyVersion) return; // TODO: Error handling
 
     onRemoveClick!({ id, dataKey, dataKeyVersion, name });
   };
-
-  $effect(() => {
-    if (info.dataKey) {
-      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={openFile}
     actionButtonIcon={onRemoveClick && IconClose}
     onActionButtonClick={removeFile}
   >
-  <DirectoryEntryLabel type="file" {thumbnail} name={info.name} />
+    <DirectoryEntryLabel type="file" name={$info.name} />
   </ActionEntryButton>
+{/if}

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

@@ -1,5 +1,3 @@
-export { requestFileThumbnailDownload } from "$lib/services/file";
-
 export interface SelectedFile {
   id: number;
   dataKey: CryptoKey;

src/lib/components/organisms/modals/ForceLoginModal.svelte

@@ -1,22 +0,0 @@
-<script lang="ts">
-  import { ActionModal } from "$lib/components/molecules";
-
-  interface Props {
-    isOpen: boolean;
-    oncancel?: () => void;
-    onLoginClick: () => void;
-  }
-
-  let { isOpen = $bindable(), oncancel, onLoginClick }: Props = $props();
-</script>
-
-<ActionModal
-  bind:isOpen
-  title="다른 디바이스에 이미 로그인되어 있어요."
-  cancelText="아니요"
-  {oncancel}
-  confirmText="네"
-  onConfirmClick={onLoginClick}
->
-  <p>다른 디바이스에서는 로그아웃하고, 이 디바이스에서 로그인할까요?</p>
-</ActionModal>

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

@@ -1,4 +1,3 @@
 export { default as CategoryCreateModal } from "./CategoryCreateModal.svelte";
-export { default as ForceLoginModal } from "./ForceLoginModal.svelte";
 export { default as RenameModal } from "./RenameModal.svelte";
 export { default as TextInputModal } from "./TextInputModal.svelte";

src/lib/hooks/callApi.ts

@@ -1,24 +1,11 @@
-interface FetchOptions {
+export const callGetApi = async (input: RequestInfo, fetchInternal = fetch) => {
-  fetch?: typeof fetch;
+  return await fetchInternal(input);
-  signal?: AbortSignal;
-}
-
-export const callGetApi = async (
-  input: RequestInfo,
-  { fetch = globalThis.fetch, signal }: FetchOptions = {},
-) => {
-  return await fetch(input, { method: "GET", signal });
 };
 
-export const callPostApi = async <T>(
+export const callPostApi = async <T>(input: RequestInfo, payload?: T, fetchInternal = fetch) => {
-  input: RequestInfo,
+  return await fetchInternal(input, {
-  payload?: T,
-  { fetch = globalThis.fetch, signal }: FetchOptions = {},
-) => {
-  return await fetch(input, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
     body: payload ? JSON.stringify(payload) : undefined,
-    signal,
   });
 };

src/lib/indexedDB/filesystem.ts

@@ -25,7 +25,6 @@ interface CategoryInfo {
   parentId: CategoryId;
   name: string;
   files: { id: number; isRecursive: boolean }[];
-  isFileRecursive: boolean;
 }
 
 const filesystem = new Dexie("filesystem") as Dexie & {
@@ -34,20 +33,10 @@ const filesystem = new Dexie("filesystem") as Dexie & {
   category: EntityTable<CategoryInfo, "id">;
 };
 
-filesystem
+filesystem.version(2).stores({
-  .version(3)
-  .stores({
   directory: "id, parentId",
   file: "id, parentId",
   category: "id, parentId",
-  })
-  .upgrade(async (trx) => {
-    await trx
-      .table("category")
-      .toCollection()
-      .modify((category) => {
-        category.isFileRecursive = false;
-      });
 });
 
 export const getDirectoryInfos = async (parentId: DirectoryId) => {
@@ -62,18 +51,10 @@ export const storeDirectoryInfo = async (directoryInfo: DirectoryInfo) => {
   await filesystem.directory.put(directoryInfo);
 };
 
-export const updateDirectoryInfo = async (id: number, changes: { name?: string }) => {
-  await filesystem.directory.update(id, changes);
-};
-
 export const deleteDirectoryInfo = async (id: number) => {
   await filesystem.directory.delete(id);
 };
 
-export const getAllFileInfos = async () => {
-  return await filesystem.file.toArray();
-};
-
 export const getFileInfos = async (parentId: DirectoryId) => {
   return await filesystem.file.where({ parentId }).toArray();
 };
@@ -86,10 +67,6 @@ export const storeFileInfo = async (fileInfo: FileInfo) => {
   await filesystem.file.put(fileInfo);
 };
 
-export const updateFileInfo = async (id: number, changes: { name?: string }) => {
-  await filesystem.file.update(id, changes);
-};
-
 export const deleteFileInfo = async (id: number) => {
   await filesystem.file.delete(id);
 };
@@ -106,13 +83,6 @@ export const storeCategoryInfo = async (categoryInfo: CategoryInfo) => {
   await filesystem.category.put(categoryInfo);
 };
 
-export const updateCategoryInfo = async (
-  id: number,
-  changes: { name?: string; isFileRecursive?: boolean },
-) => {
-  await filesystem.category.update(id, changes);
-};
-
 export const deleteCategoryInfo = async (id: number) => {
   await filesystem.category.delete(id);
 };

src/lib/modules/crypto/rsa.ts

@@ -46,56 +46,6 @@ export const exportRSAKeyToBase64 = async (key: CryptoKey) => {
   return encodeToBase64((await exportRSAKey(key)).key);
 };
 
-export const importEncryptionKeyPairFromBase64 = async (
-  encryptKeyBase64: string,
-  decryptKeyBase64: string,
-) => {
-  const algorithm: RsaHashedImportParams = {
-    name: "RSA-OAEP",
-    hash: "SHA-256",
-  };
-  const encryptKey = await window.crypto.subtle.importKey(
-    "spki",
-    decodeFromBase64(encryptKeyBase64),
-    algorithm,
-    true,
-    ["encrypt", "wrapKey"],
-  );
-  const decryptKey = await window.crypto.subtle.importKey(
-    "pkcs8",
-    decodeFromBase64(decryptKeyBase64),
-    algorithm,
-    true,
-    ["decrypt", "unwrapKey"],
-  );
-  return { encryptKey, decryptKey };
-};
-
-export const importSigningKeyPairFromBase64 = async (
-  signKeyBase64: string,
-  verifyKeyBase64: string,
-) => {
-  const algorithm: RsaHashedImportParams = {
-    name: "RSA-PSS",
-    hash: "SHA-256",
-  };
-  const signKey = await window.crypto.subtle.importKey(
-    "pkcs8",
-    decodeFromBase64(signKeyBase64),
-    algorithm,
-    true,
-    ["sign"],
-  );
-  const verifyKey = await window.crypto.subtle.importKey(
-    "spki",
-    decodeFromBase64(verifyKeyBase64),
-    algorithm,
-    true,
-    ["verify"],
-  );
-  return { signKey, verifyKey };
-};
-
 export const makeRSAKeyNonextractable = async (key: CryptoKey) => {
   const { key: exportedKey, format } = await exportRSAKey(key);
   return await window.crypto.subtle.importKey(

src/lib/modules/file/cache.ts

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

src/lib/modules/file/upload.ts

@@ -5,18 +5,15 @@ import { writable, type Writable } from "svelte/store";
 import {
   encodeToBase64,
   generateDataKey,
-  makeAESKeyNonextractable,
   wrapDataKey,
   encryptData,
   encryptString,
   digestMessage,
   signMessageHmac,
 } from "$lib/modules/crypto";
-import { generateThumbnail } from "$lib/modules/thumbnail";
 import type {
   DuplicateFileScanRequest,
   DuplicateFileScanResponse,
-  FileThumbnailUploadRequest,
   FileUploadRequest,
   FileUploadResponse,
 } from "$lib/server/schemas";
@@ -109,34 +106,27 @@ const encryptFile = limitFunction(
       createdAt && (await encryptString(createdAt.getTime().toString(), dataKey));
     const lastModifiedAtEncrypted = await encryptString(file.lastModified.toString(), dataKey);
 
-    const thumbnail = await generateThumbnail(fileBuffer, fileType);
-    const thumbnailBuffer = await thumbnail?.arrayBuffer();
-    const thumbnailEncrypted = thumbnailBuffer && (await encryptData(thumbnailBuffer, dataKey));
-
     status.update((value) => {
       value.status = "upload-pending";
       return value;
     });
 
     return {
-      dataKey: await makeAESKeyNonextractable(dataKey),
       dataKeyWrapped,
       dataKeyVersion,
       fileType,
       fileEncrypted,
       fileEncryptedHash,
       nameEncrypted,
-      createdAt,
       createdAtEncrypted,
       lastModifiedAtEncrypted,
-      thumbnail: thumbnailEncrypted && { plaintext: thumbnailBuffer, ...thumbnailEncrypted },
     };
   },
   { concurrency: 4 },
 );
 
 const requestFileUpload = limitFunction(
-  async (status: Writable<FileUploadStatus>, form: FormData, thumbnailForm: FormData | null) => {
+  async (status: Writable<FileUploadStatus>, form: FormData) => {
     status.update((value) => {
       value.status = "uploading";
       return value;
@@ -154,15 +144,6 @@ const requestFileUpload = limitFunction(
     });
     const { file }: FileUploadResponse = res.data;
 
-    if (thumbnailForm) {
-      try {
-        await axios.post(`/api/file/${file}/thumbnail/upload`, thumbnailForm);
-      } catch (e) {
-        // TODO
-        console.error(e);
-      }
-    }
-
     status.update((value) => {
       value.status = "uploaded";
       return value;
@@ -179,7 +160,7 @@ export const uploadFile = async (
   hmacSecret: HmacSecret,
   masterKey: MasterKey,
   onDuplicate: () => Promise<boolean>,
-) => {
+): Promise<{ fileId: number; fileBuffer: ArrayBuffer } | undefined> => {
   const status = writable<FileUploadStatus>({
     name: file.name,
     parentId,
@@ -209,17 +190,14 @@ export const uploadFile = async (
     }
 
     const {
-      dataKey,
       dataKeyWrapped,
       dataKeyVersion,
       fileType,
       fileEncrypted,
       fileEncryptedHash,
       nameEncrypted,
-      createdAt,
       createdAtEncrypted,
       lastModifiedAtEncrypted,
-      thumbnail,
     } = await encryptFile(status, file, fileBuffer, masterKey);
 
     const form = new FormData();
@@ -240,35 +218,13 @@ export const uploadFile = async (
         createdAtIv: createdAtEncrypted?.iv,
         lastModifiedAt: lastModifiedAtEncrypted.ciphertext,
         lastModifiedAtIv: lastModifiedAtEncrypted.iv,
-      } satisfies FileUploadRequest),
+      } as FileUploadRequest),
     );
     form.set("content", new Blob([fileEncrypted.ciphertext]));
     form.set("checksum", fileEncryptedHash);
 
-    let thumbnailForm = null;
+    const { fileId } = await requestFileUpload(status, form);
-    if (thumbnail) {
+    return { fileId, fileBuffer };
-      thumbnailForm = new FormData();
-      thumbnailForm.set(
-        "metadata",
-        JSON.stringify({
-          dekVersion: dataKeyVersion.toISOString(),
-          contentIv: thumbnail.iv,
-        } satisfies FileThumbnailUploadRequest),
-      );
-      thumbnailForm.set("content", new Blob([thumbnail.ciphertext]));
-    }
-
-    const { fileId } = await requestFileUpload(status, form, thumbnailForm);
-    return {
-      fileId,
-      fileDataKey: dataKey,
-      fileDataKeyVersion: dataKeyVersion,
-      fileType,
-      fileEncryptedIv: fileEncrypted.iv,
-      fileCreatedAt: createdAt,
-      fileBuffer,
-      thumbnailBuffer: thumbnail?.plaintext,
-    };
   } catch (e) {
     status.update((value) => {
       value.status = "error";

src/lib/modules/filesystem.ts

@@ -0,0 +1,329 @@
+import { get, writable, type Writable } from "svelte/store";
+import { callGetApi } from "$lib/hooks";
+import {
+  getDirectoryInfos as getDirectoryInfosFromIndexedDB,
+  getDirectoryInfo as getDirectoryInfoFromIndexedDB,
+  storeDirectoryInfo,
+  deleteDirectoryInfo,
+  getFileInfos as getFileInfosFromIndexedDB,
+  getFileInfo as getFileInfoFromIndexedDB,
+  storeFileInfo,
+  deleteFileInfo,
+  getCategoryInfos as getCategoryInfosFromIndexedDB,
+  getCategoryInfo as getCategoryInfoFromIndexedDB,
+  storeCategoryInfo,
+  deleteCategoryInfo,
+  type DirectoryId,
+  type CategoryId,
+} from "$lib/indexedDB";
+import { unwrapDataKey, decryptString } from "$lib/modules/crypto";
+import type {
+  CategoryInfoResponse,
+  CategoryFileListResponse,
+  DirectoryInfoResponse,
+  FileInfoResponse,
+} from "$lib/server/schemas";
+
+export type DirectoryInfo =
+  | {
+      id: "root";
+      dataKey?: undefined;
+      dataKeyVersion?: undefined;
+      name?: undefined;
+      subDirectoryIds: number[];
+      fileIds: number[];
+    }
+  | {
+      id: number;
+      dataKey?: CryptoKey;
+      dataKeyVersion?: Date;
+      name: string;
+      subDirectoryIds: number[];
+      fileIds: number[];
+    };
+
+export interface FileInfo {
+  id: number;
+  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;
+    }
+  | {
+      id: number;
+      dataKey?: CryptoKey;
+      dataKeyVersion?: Date;
+      name: string;
+      subCategoryIds: number[];
+      files: { id: number; isRecursive: 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, name: directory.name, subDirectoryIds, fileIds });
+  }
+};
+
+const fetchDirectoryInfoFromServer = async (
+  id: DirectoryId,
+  info: Writable<DirectoryInfo | null>,
+  masterKey: CryptoKey,
+) => {
+  const res = await callGetApi(`/api/directory/${id}`);
+  if (res.status === 404) {
+    info.set(null);
+    await deleteDirectoryInfo(id as number);
+    return;
+  } else if (!res.ok) {
+    throw new Error("Failed to fetch directory information");
+  }
+
+  const {
+    metadata,
+    subDirectories: subDirectoryIds,
+    files: fileIds,
+  }: DirectoryInfoResponse = await res.json();
+
+  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,
+      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,
+) => {
+  const res = await callGetApi(`/api/file/${id}`);
+  if (res.status === 404) {
+    info.set(null);
+    await deleteFileInfo(id);
+    return;
+  } else if (!res.ok) {
+    throw new Error("Failed to fetch file information");
+  }
+
+  const metadata: FileInfoResponse = await res.json();
+  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,
+    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 });
+  }
+};
+
+const fetchCategoryInfoFromServer = async (
+  id: CategoryId,
+  info: Writable<CategoryInfo | null>,
+  masterKey: CryptoKey,
+) => {
+  let res = await callGetApi(`/api/category/${id}`);
+  if (res.status === 404) {
+    info.set(null);
+    await deleteCategoryInfo(id as number);
+    return;
+  } else if (!res.ok) {
+    throw new Error("Failed to fetch category information");
+  }
+
+  const { metadata, subCategories }: CategoryInfoResponse = await res.json();
+
+  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);
+
+    res = await callGetApi(`/api/category/${id}/file/list?recurse=true`);
+    if (!res.ok) {
+      throw new Error("Failed to fetch category files");
+    }
+
+    const { files }: CategoryFileListResponse = await res.json();
+    const filesMapped = files.map(({ file, isRecursive }) => ({ id: file, isRecursive }));
+
+    info.set({
+      id,
+      dataKey,
+      dataKeyVersion: new Date(metadata!.dekVersion),
+      name,
+      subCategoryIds: subCategories,
+      files: filesMapped,
+    });
+    await storeCategoryInfo({
+      id,
+      parentId: metadata!.parent,
+      name,
+      files: filesMapped,
+    });
+  }
+};
+
+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;
+};

src/lib/modules/filesystem2/category.ts

@@ -1,294 +0,0 @@
-import { useQueryClient, createQuery, createMutation } from "@tanstack/svelte-query";
-import { callGetApi, callPostApi } from "$lib/hooks";
-import {
-  getCategoryInfos as getCategoryInfosFromIndexedDB,
-  getCategoryInfo as getCategoryInfoFromIndexedDB,
-  storeCategoryInfo,
-  updateCategoryInfo,
-  deleteCategoryInfo,
-  type CategoryId,
-} from "$lib/indexedDB";
-import {
-  generateDataKey,
-  wrapDataKey,
-  unwrapDataKey,
-  encryptString,
-  decryptString,
-} from "$lib/modules/crypto";
-import type {
-  CategoryInfoResponse,
-  CategoryFileListResponse,
-  CategoryRenameRequest,
-  CategoryCreateRequest,
-  CategoryCreateResponse,
-} from "$lib/server/schemas";
-import type { MasterKey } from "$lib/stores";
-
-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;
-    };
-export type SubCategoryInfo = CategoryInfo & { id: number };
-
-let temporaryIdCounter = -1;
-
-const getInitialCategoryInfo = async (id: CategoryId) => {
-  const [category, subCategories] = await Promise.all([
-    id !== "root" ? getCategoryInfoFromIndexedDB(id) : undefined,
-    getCategoryInfosFromIndexedDB(id),
-  ]);
-  const subCategoryIds = subCategories.map(({ id }) => id);
-
-  if (id === "root") {
-    return { id, subCategoryIds };
-  } else if (category) {
-    return {
-      id,
-      name: category.name,
-      subCategoryIds,
-      files: category.files,
-      isFileRecursive: category.isFileRecursive,
-    };
-  }
-  return undefined;
-};
-
-export const getCategoryInfo = (id: CategoryId, masterKey: CryptoKey) => {
-  return createQuery<CategoryInfo>({
-    queryKey: ["category", id],
-    queryFn: async ({ client, signal }) => {
-      if (!client.getQueryData<CategoryInfo>(["category", id])) {
-        const initialInfo = await getInitialCategoryInfo(id);
-        if (initialInfo) {
-          setTimeout(() => client.invalidateQueries({ queryKey: ["category", id] }), 0);
-          return initialInfo;
-        }
-      }
-
-      const res = await callGetApi(`/api/category/${id}`, { signal }); // TODO: 404
-      const { metadata, subCategories }: CategoryInfoResponse = await res.json();
-
-      if (id === "root") {
-        return { id, subCategoryIds: subCategories };
-      } else {
-        const { dataKey } = await unwrapDataKey(metadata!.dek, masterKey);
-        const name = await decryptString(metadata!.name, metadata!.nameIv, dataKey);
-
-        const res = await callGetApi(`/api/category/${id}/file/list?recurse=true`); // TODO: Error Handling
-        const { files }: CategoryFileListResponse = await res.json();
-        const filesMapped = files.map(({ file, isRecursive }) => ({ id: file, isRecursive }));
-
-        const prevInfo = client.getQueryData<CategoryInfo>(["category", id]);
-        await storeCategoryInfo({
-          id,
-          parentId: metadata!.parent,
-          name,
-          files: filesMapped,
-          isFileRecursive: prevInfo?.isFileRecursive ?? false,
-        });
-        return {
-          id,
-          dataKey,
-          dataKeyVersion: new Date(metadata!.dekVersion),
-          name,
-          subCategoryIds: subCategories,
-          files: filesMapped,
-          isFileRecursive: prevInfo?.isFileRecursive ?? false,
-        };
-      }
-    },
-    staleTime: Infinity,
-  });
-};
-
-export type CategoryInfoStore = ReturnType<typeof getCategoryInfo>;
-
-export const useCategoryCreation = (parentId: CategoryId, masterKey: MasterKey) => {
-  const queryClient = useQueryClient();
-  return createMutation<void, Error, { name: string }, { tempId: number }>({
-    mutationFn: async ({ name }) => {
-      const { dataKey, dataKeyVersion } = await generateDataKey();
-      const nameEncrypted = await encryptString(name, dataKey);
-
-      const res = await callPostApi<CategoryCreateRequest>("/api/category/create", {
-        parent: parentId,
-        mekVersion: masterKey.version,
-        dek: await wrapDataKey(dataKey, masterKey.key),
-        dekVersion: dataKeyVersion.toISOString(),
-        name: nameEncrypted.ciphertext,
-        nameIv: nameEncrypted.iv,
-      });
-      if (!res.ok) throw new Error("Failed to create category");
-
-      const { category: id }: CategoryCreateResponse = await res.json();
-      queryClient.setQueryData<CategoryInfo>(["category", id], {
-        id,
-        name,
-        dataKey,
-        dataKeyVersion,
-        subCategoryIds: [],
-        files: [],
-        isFileRecursive: false,
-      });
-      await storeCategoryInfo({ id, parentId, name, files: [], isFileRecursive: false });
-    },
-    onMutate: async ({ name }) => {
-      const tempId = temporaryIdCounter--;
-      queryClient.setQueryData<CategoryInfo>(["category", tempId], {
-        id: tempId,
-        name,
-        subCategoryIds: [],
-        files: [],
-        isFileRecursive: false,
-      });
-
-      await queryClient.cancelQueries({ queryKey: ["category", parentId] });
-      queryClient.setQueryData<CategoryInfo>(["category", parentId], (prevParentInfo) => {
-        if (!prevParentInfo) return;
-        return {
-          ...prevParentInfo,
-          subCategoryIds: [...prevParentInfo.subCategoryIds, tempId],
-        };
-      });
-
-      return { tempId };
-    },
-    onError: (_error, _variables, context) => {
-      if (context) {
-        queryClient.setQueryData<CategoryInfo>(["category", parentId], (prevParentInfo) => {
-          if (!prevParentInfo) return;
-          return {
-            ...prevParentInfo,
-            subCategoryIds: prevParentInfo.subCategoryIds.filter((id) => id !== context.tempId),
-          };
-        });
-      }
-    },
-    onSettled: () => {
-      queryClient.invalidateQueries({ queryKey: ["category", parentId] });
-    },
-  });
-};
-
-export const useCategoryRename = () => {
-  const queryClient = useQueryClient();
-  return createMutation<
-    void,
-    Error,
-    {
-      id: number;
-      dataKey: CryptoKey;
-      dataKeyVersion: Date;
-      newName: string;
-    },
-    { oldName: string | undefined }
-  >({
-    mutationFn: async ({ id, dataKey, dataKeyVersion, newName }) => {
-      const newNameEncrypted = await encryptString(newName, dataKey);
-      const res = await callPostApi<CategoryRenameRequest>(`/api/category/${id}/rename`, {
-        dekVersion: dataKeyVersion.toISOString(),
-        name: newNameEncrypted.ciphertext,
-        nameIv: newNameEncrypted.iv,
-      });
-      if (!res.ok) throw new Error("Failed to rename category");
-
-      await updateCategoryInfo(id, { name: newName });
-    },
-    onMutate: async ({ id, newName }) => {
-      await queryClient.cancelQueries({ queryKey: ["category", id] });
-
-      const prevInfo = queryClient.getQueryData<SubCategoryInfo>(["category", id]);
-      if (prevInfo) {
-        queryClient.setQueryData<CategoryInfo>(["category", id], {
-          ...prevInfo,
-          name: newName,
-        });
-      }
-
-      return { oldName: prevInfo?.name };
-    },
-    onError: (_error, { id }, context) => {
-      if (context?.oldName) {
-        queryClient.setQueryData<SubCategoryInfo>(["category", id], (prevInfo) => {
-          if (!prevInfo) return;
-          return { ...prevInfo, name: context.oldName! };
-        });
-      }
-    },
-    onSettled: (_data, _error, { id }) => {
-      queryClient.invalidateQueries({ queryKey: ["category", id] });
-    },
-  });
-};
-
-export const useCategoryDeletion = (parentId: CategoryId) => {
-  const queryClient = useQueryClient();
-  return createMutation<void, Error, { id: number }, {}>({
-    mutationFn: async ({ id }) => {
-      const res = await callPostApi(`/api/category/${id}/delete`);
-      if (!res.ok) throw new Error("Failed to delete category");
-
-      await deleteCategoryInfo(id);
-
-      // TODO: Update FileInfo
-    },
-    onMutate: async ({ id }) => {
-      await queryClient.cancelQueries({ queryKey: ["category", parentId] });
-      queryClient.setQueryData<CategoryInfo>(["category", parentId], (prevParentInfo) => {
-        if (!prevParentInfo) return;
-        return {
-          ...prevParentInfo,
-          subCategoryIds: prevParentInfo.subCategoryIds.filter((categoryId) => categoryId !== id),
-        };
-      });
-      return {};
-    },
-    onError: (_error, { id }, context) => {
-      if (context) {
-        queryClient.setQueryData<CategoryInfo>(["category", parentId], (prevParentInfo) => {
-          if (!prevParentInfo) return;
-          return {
-            ...prevParentInfo,
-            subCategoryIds: [...prevParentInfo.subCategoryIds, id],
-          };
-        });
-      }
-    },
-    onSettled: () => {
-      queryClient.invalidateQueries({ queryKey: ["category", parentId] });
-    },
-  });
-};
-
-export const useCategoryFileRecursionToggle = () => {
-  const queryClient = useQueryClient();
-  return createMutation<void, Error, { id: number; isFileRecursive: boolean }, {}>({
-    mutationFn: async ({ id, isFileRecursive }) => {
-      await updateCategoryInfo(id, { isFileRecursive });
-    },
-    onMutate: async ({ id, isFileRecursive }) => {
-      const prevInfo = queryClient.getQueryData<SubCategoryInfo>(["category", id]);
-      if (prevInfo) {
-        queryClient.setQueryData<CategoryInfo>(["category", id], {
-          ...prevInfo,
-          isFileRecursive,
-        });
-      }
-    },
-  });
-};

src/lib/modules/filesystem2/directory.ts

@@ -1,267 +0,0 @@
-import { useQueryClient, createQuery, createMutation } from "@tanstack/svelte-query";
-import { callGetApi, callPostApi } from "$lib/hooks";
-import {
-  getDirectoryInfos as getDirectoryInfosFromIndexedDB,
-  getDirectoryInfo as getDirectoryInfoFromIndexedDB,
-  storeDirectoryInfo,
-  updateDirectoryInfo,
-  deleteDirectoryInfo,
-  getFileInfos as getFileInfosFromIndexedDB,
-  deleteFileInfo,
-  type DirectoryId,
-} from "$lib/indexedDB";
-import {
-  generateDataKey,
-  wrapDataKey,
-  unwrapDataKey,
-  encryptString,
-  decryptString,
-} from "$lib/modules/crypto";
-import type {
-  DirectoryInfoResponse,
-  DirectoryDeleteResponse,
-  DirectoryRenameRequest,
-  DirectoryCreateRequest,
-  DirectoryCreateResponse,
-} from "$lib/server/schemas";
-import type { MasterKey } from "$lib/stores";
-
-export type DirectoryInfo =
-  | {
-      id: "root";
-      dataKey?: undefined;
-      dataKeyVersion?: undefined;
-      name?: undefined;
-      subDirectoryIds: number[];
-      fileIds: number[];
-    }
-  | {
-      id: number;
-      dataKey?: CryptoKey;
-      dataKeyVersion?: Date;
-      name: string;
-      subDirectoryIds: number[];
-      fileIds: number[];
-    };
-export type SubDirectoryInfo = DirectoryInfo & { id: number };
-
-let temporaryIdCounter = -1;
-
-const getInitialDirectoryInfo = async (id: DirectoryId) => {
-  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") {
-    return { id, subDirectoryIds, fileIds };
-  } else if (directory) {
-    return { id, name: directory.name, subDirectoryIds, fileIds };
-  }
-  return undefined;
-};
-
-export const getDirectoryInfo = (id: DirectoryId, masterKey: CryptoKey) => {
-  return createQuery<DirectoryInfo>({
-    queryKey: ["directory", id],
-    queryFn: async ({ client, signal }) => {
-      if (!client.getQueryData(["directory", id])) {
-        const initialInfo = await getInitialDirectoryInfo(id);
-        if (initialInfo) {
-          setTimeout(() => client.invalidateQueries({ queryKey: ["directory", id] }), 0);
-          return initialInfo;
-        }
-      }
-
-      const res = await callGetApi(`/api/directory/${id}`, { signal }); // TODO: 404
-      const {
-        metadata,
-        subDirectories: subDirectoryIds,
-        files: fileIds,
-      }: DirectoryInfoResponse = await res.json();
-
-      if (id === "root") {
-        return { id, subDirectoryIds, fileIds };
-      } else {
-        const { dataKey } = await unwrapDataKey(metadata!.dek, masterKey);
-        const name = await decryptString(metadata!.name, metadata!.nameIv, dataKey);
-        await storeDirectoryInfo({ id, parentId: metadata!.parent, name });
-        return {
-          id,
-          dataKey,
-          dataKeyVersion: new Date(metadata!.dekVersion),
-          name,
-          subDirectoryIds,
-          fileIds,
-        };
-      }
-    },
-    staleTime: Infinity,
-  });
-};
-
-export type DirectoryInfoStore = ReturnType<typeof getDirectoryInfo>;
-
-export const useDirectoryCreation = (parentId: DirectoryId, masterKey: MasterKey) => {
-  const queryClient = useQueryClient();
-  return createMutation<void, Error, { name: string }, { tempId: number }>({
-    mutationFn: async ({ name }) => {
-      const { dataKey, dataKeyVersion } = await generateDataKey();
-      const nameEncrypted = await encryptString(name, dataKey);
-
-      const res = await callPostApi<DirectoryCreateRequest>(`/api/directory/create`, {
-        parent: parentId,
-        mekVersion: masterKey.version,
-        dek: await wrapDataKey(dataKey, masterKey.key),
-        dekVersion: dataKeyVersion.toISOString(),
-        name: nameEncrypted.ciphertext,
-        nameIv: nameEncrypted.iv,
-      });
-      if (!res.ok) throw new Error("Failed to create directory");
-
-      const { directory: id }: DirectoryCreateResponse = await res.json();
-      queryClient.setQueryData<DirectoryInfo>(["directory", id], {
-        id,
-        name,
-        dataKey,
-        dataKeyVersion,
-        subDirectoryIds: [],
-        fileIds: [],
-      });
-      await storeDirectoryInfo({ id, parentId, name });
-    },
-    onMutate: async ({ name }) => {
-      const tempId = temporaryIdCounter--;
-      queryClient.setQueryData<DirectoryInfo>(["directory", tempId], {
-        id: tempId,
-        name,
-        subDirectoryIds: [],
-        fileIds: [],
-      });
-
-      await queryClient.cancelQueries({ queryKey: ["directory", parentId] });
-      queryClient.setQueryData<DirectoryInfo>(["directory", parentId], (prevParentInfo) => {
-        if (!prevParentInfo) return undefined;
-        return {
-          ...prevParentInfo,
-          subDirectoryIds: [...prevParentInfo.subDirectoryIds, tempId],
-        };
-      });
-
-      return { tempId };
-    },
-    onError: (_error, _variables, context) => {
-      if (context) {
-        queryClient.setQueryData<DirectoryInfo>(["directory", parentId], (prevParentInfo) => {
-          if (!prevParentInfo) return undefined;
-          return {
-            ...prevParentInfo,
-            subDirectoryIds: prevParentInfo.subDirectoryIds.filter((id) => id !== context.tempId),
-          };
-        });
-      }
-    },
-    onSettled: () => {
-      queryClient.invalidateQueries({ queryKey: ["directory", parentId] });
-    },
-  });
-};
-
-export const useDirectoryRename = () => {
-  const queryClient = useQueryClient();
-  return createMutation<
-    void,
-    Error,
-    {
-      id: number;
-      dataKey: CryptoKey;
-      dataKeyVersion: Date;
-      newName: string;
-    },
-    { oldName: string | undefined }
-  >({
-    mutationFn: async ({ id, dataKey, dataKeyVersion, newName }) => {
-      const newNameEncrypted = await encryptString(newName, dataKey);
-      const res = await callPostApi<DirectoryRenameRequest>(`/api/directory/${id}/rename`, {
-        dekVersion: dataKeyVersion.toISOString(),
-        name: newNameEncrypted.ciphertext,
-        nameIv: newNameEncrypted.iv,
-      });
-      if (!res.ok) throw new Error("Failed to rename directory");
-
-      await updateDirectoryInfo(id, { name: newName });
-    },
-    onMutate: async ({ id, newName }) => {
-      await queryClient.cancelQueries({ queryKey: ["directory", id] });
-
-      const prevInfo = queryClient.getQueryData<SubDirectoryInfo>(["directory", id]);
-      if (prevInfo) {
-        queryClient.setQueryData<DirectoryInfo>(["directory", id], {
-          ...prevInfo,
-          name: newName,
-        });
-      }
-
-      return { oldName: prevInfo?.name };
-    },
-    onError: (_error, { id }, context) => {
-      if (context?.oldName) {
-        queryClient.setQueryData<SubDirectoryInfo>(["directory", id], (prevInfo) => {
-          if (!prevInfo) return undefined;
-          return { ...prevInfo, name: context.oldName! };
-        });
-      }
-    },
-    onSettled: (_data, _error, { id }) => {
-      queryClient.invalidateQueries({ queryKey: ["directory", id] });
-    },
-  });
-};
-
-export const useDirectoryDeletion = (parentId: DirectoryId) => {
-  const queryClient = useQueryClient();
-  return createMutation<{ deletedFiles: number[] }, Error, { id: number }, {}>({
-    mutationFn: async ({ id }) => {
-      const res = await callPostApi(`/api/directory/${id}/delete`);
-      if (!res.ok) throw new Error("Failed to delete directory");
-
-      const { deletedDirectories, deletedFiles }: DirectoryDeleteResponse = await res.json();
-      await Promise.all([
-        ...deletedDirectories.map(deleteDirectoryInfo),
-        ...deletedFiles.map(deleteFileInfo),
-      ]);
-
-      return { deletedFiles };
-    },
-    onMutate: async ({ id }) => {
-      await queryClient.cancelQueries({ queryKey: ["directory", parentId] });
-      queryClient.setQueryData<DirectoryInfo>(["directory", parentId], (prevParentInfo) => {
-        if (!prevParentInfo) return undefined;
-        return {
-          ...prevParentInfo,
-          subDirectoryIds: prevParentInfo.subDirectoryIds.filter(
-            (subDirectoryId) => subDirectoryId !== id,
-          ),
-        };
-      });
-      return {};
-    },
-    onError: (_error, { id }, context) => {
-      if (context) {
-        queryClient.setQueryData<DirectoryInfo>(["directory", parentId], (prevParentInfo) => {
-          if (!prevParentInfo) return undefined;
-          return {
-            ...prevParentInfo,
-            subDirectoryIds: [...prevParentInfo.subDirectoryIds, id],
-          };
-        });
-      }
-    },
-    onSettled: () => {
-      queryClient.invalidateQueries({ queryKey: ["directory", parentId] });
-    },
-  });
-};

src/lib/modules/filesystem2/file.ts

@@ -1,230 +0,0 @@
-import { useQueryClient, createQuery, createMutation } from "@tanstack/svelte-query";
-import { callGetApi, callPostApi } from "$lib/hooks";
-import {
-  getFileInfo as getFileInfoFromIndexedDB,
-  storeFileInfo,
-  updateFileInfo,
-  deleteFileInfo,
-  type DirectoryId,
-} from "$lib/indexedDB";
-import { unwrapDataKey, encryptString, decryptString } from "$lib/modules/crypto";
-import { uploadFile } from "$lib/modules/file";
-import type { FileInfoResponse, FileRenameRequest } from "$lib/server/schemas";
-import type { MasterKey, HmacSecret } from "$lib/stores";
-import type { DirectoryInfo } from "./directory";
-
-export interface FileInfo {
-  id: number;
-  dataKey?: CryptoKey;
-  dataKeyVersion?: Date;
-  contentType: string;
-  contentIv?: string;
-  name: string;
-  createdAt?: Date;
-  lastModifiedAt: Date;
-  categoryIds: number[];
-}
-
-const decryptDate = async (ciphertext: string, iv: string, dataKey: CryptoKey) => {
-  return new Date(parseInt(await decryptString(ciphertext, iv, dataKey), 10));
-};
-
-export const getFileInfo = (id: number, masterKey: CryptoKey) => {
-  return createQuery<FileInfo>({
-    queryKey: ["file", id],
-    queryFn: async ({ client, signal }) => {
-      if (!client.getQueryData(["file", id])) {
-        const initialInfo = await getFileInfoFromIndexedDB(id);
-        if (initialInfo) {
-          setTimeout(() => client.invalidateQueries({ queryKey: ["file", id] }), 0);
-          return initialInfo;
-        }
-      }
-
-      const res = await callGetApi(`/api/file/${id}`, { signal }); // TODO: 404
-      const metadata: FileInfoResponse = await res.json();
-
-      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,
-      );
-
-      await storeFileInfo({
-        id,
-        parentId: metadata.parent,
-        name,
-        contentType: metadata.contentType,
-        createdAt,
-        lastModifiedAt,
-        categoryIds: metadata.categories,
-      });
-      return {
-        id,
-        dataKey,
-        dataKeyVersion: new Date(metadata.dekVersion),
-        contentType: metadata.contentType,
-        contentIv: metadata.contentIv,
-        name,
-        createdAt,
-        lastModifiedAt,
-        categoryIds: metadata.categories,
-      };
-    },
-    staleTime: Infinity,
-  });
-};
-
-export type FileInfoStore = ReturnType<typeof getFileInfo>;
-
-export const useFileUpload = (
-  parentId: DirectoryId,
-  masterKey: MasterKey,
-  hmacSecret: HmacSecret,
-) => {
-  const queryClient = useQueryClient();
-  return createMutation<
-    { fileId: number; fileBuffer: ArrayBuffer; thumbnailBuffer?: ArrayBuffer },
-    Error,
-    { file: File; onDuplicate: () => Promise<boolean> },
-    { tempId: number }
-  >({
-    mutationFn: async ({ file, onDuplicate }) => {
-      const res = await uploadFile(file, parentId, hmacSecret, masterKey, onDuplicate);
-      if (!res) throw new Error("Failed to upload file");
-
-      queryClient.setQueryData<FileInfo>(["file", res.fileId], {
-        id: res.fileId,
-        dataKey: res.fileDataKey,
-        dataKeyVersion: res.fileDataKeyVersion,
-        contentType: res.fileType,
-        contentIv: res.fileEncryptedIv,
-        name: file.name,
-        createdAt: res.fileCreatedAt,
-        lastModifiedAt: new Date(file.lastModified),
-        categoryIds: [],
-      });
-      await storeFileInfo({
-        id: res.fileId,
-        parentId,
-        name: file.name,
-        contentType: res.fileType,
-        createdAt: res.fileCreatedAt,
-        lastModifiedAt: new Date(file.lastModified),
-        categoryIds: [],
-      });
-      return {
-        fileId: res.fileId,
-        fileBuffer: res.fileBuffer,
-        thumbnailBuffer: res.thumbnailBuffer,
-      };
-    },
-    onSuccess: async ({ fileId }) => {
-      await queryClient.cancelQueries({ queryKey: ["directory", parentId] });
-      queryClient.setQueryData<DirectoryInfo>(["directory", parentId], (prevParentInfo) => {
-        if (!prevParentInfo) return undefined;
-        return {
-          ...prevParentInfo,
-          fileIds: [...prevParentInfo.fileIds, fileId],
-        };
-      });
-    },
-    onSettled: () => {
-      queryClient.invalidateQueries({ queryKey: ["directory", parentId] });
-    },
-  });
-};
-
-export const useFileRename = () => {
-  const queryClient = useQueryClient();
-  return createMutation<
-    void,
-    Error,
-    {
-      id: number;
-      dataKey: CryptoKey;
-      dataKeyVersion: Date;
-      newName: string;
-    },
-    { oldName: string | undefined }
-  >({
-    mutationFn: async ({ id, dataKey, dataKeyVersion, newName }) => {
-      const newNameEncrypted = await encryptString(newName, dataKey);
-      const res = await callPostApi<FileRenameRequest>(`/api/file/${id}/rename`, {
-        dekVersion: dataKeyVersion.toISOString(),
-        name: newNameEncrypted.ciphertext,
-        nameIv: newNameEncrypted.iv,
-      });
-      if (!res.ok) throw new Error("Failed to rename file");
-
-      await updateFileInfo(id, { name: newName });
-    },
-    onMutate: async ({ id, newName }) => {
-      await queryClient.cancelQueries({ queryKey: ["file", id] });
-
-      const prevInfo = queryClient.getQueryData<FileInfo>(["file", id]);
-      if (prevInfo) {
-        queryClient.setQueryData<FileInfo>(["file", id], {
-          ...prevInfo,
-          name: newName,
-        });
-      }
-
-      return { oldName: prevInfo?.name };
-    },
-    onError: (_error, { id }, context) => {
-      if (context?.oldName) {
-        queryClient.setQueryData<FileInfo>(["file", id], (prevInfo) => {
-          if (!prevInfo) return undefined;
-          return { ...prevInfo, name: context.oldName! };
-        });
-      }
-    },
-    onSettled: (_data, _error, { id }) => {
-      queryClient.invalidateQueries({ queryKey: ["file", id] });
-    },
-  });
-};
-
-export const useFileDeletion = (parentId: DirectoryId) => {
-  const queryClient = useQueryClient();
-  return createMutation<void, Error, { id: number }, {}>({
-    mutationFn: async ({ id }) => {
-      const res = await callPostApi(`/api/file/${id}/delete`);
-      if (!res.ok) throw new Error("Failed to delete file");
-
-      await deleteFileInfo(id);
-    },
-    onMutate: async ({ id }) => {
-      await queryClient.cancelQueries({ queryKey: ["directory", parentId] });
-      queryClient.setQueryData<DirectoryInfo>(["directory", parentId], (prevParentInfo) => {
-        if (!prevParentInfo) return undefined;
-        return {
-          ...prevParentInfo,
-          fileIds: prevParentInfo.fileIds.filter((fileId) => fileId !== id),
-        };
-      });
-      return {};
-    },
-    onError: (_error, { id }, context) => {
-      if (context) {
-        queryClient.setQueryData<DirectoryInfo>(["directory", parentId], (prevParentInfo) => {
-          if (!prevParentInfo) return undefined;
-          return {
-            ...prevParentInfo,
-            fileIds: [...prevParentInfo.fileIds, id],
-          };
-        });
-      }
-    },
-    onSettled: () => {
-      queryClient.invalidateQueries({ queryKey: ["directory", parentId] });
-    },
-  });
-};

src/lib/modules/filesystem2/index.ts

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

src/lib/modules/key.ts

@@ -1,65 +0,0 @@
-import { z } from "zod";
-import { storeClientKey } from "$lib/indexedDB";
-import type { ClientKeys } from "$lib/stores";
-
-const serializedClientKeysSchema = z.intersection(
-  z.object({
-    generator: z.literal("ArkVault"),
-    exportedAt: z.string().datetime(),
-  }),
-  z.object({
-    version: z.literal(1),
-    encryptKey: z.string().base64().nonempty(),
-    decryptKey: z.string().base64().nonempty(),
-    signKey: z.string().base64().nonempty(),
-    verifyKey: z.string().base64().nonempty(),
-  }),
-);
-
-type SerializedClientKeys = z.infer<typeof serializedClientKeysSchema>;
-
-type DeserializedClientKeys = {
-  encryptKeyBase64: string;
-  decryptKeyBase64: string;
-  signKeyBase64: string;
-  verifyKeyBase64: string;
-};
-
-export const serializeClientKeys = ({
-  encryptKeyBase64,
-  decryptKeyBase64,
-  signKeyBase64,
-  verifyKeyBase64,
-}: DeserializedClientKeys) => {
-  return JSON.stringify({
-    version: 1,
-    generator: "ArkVault",
-    exportedAt: new Date().toISOString(),
-    encryptKey: encryptKeyBase64,
-    decryptKey: decryptKeyBase64,
-    signKey: signKeyBase64,
-    verifyKey: verifyKeyBase64,
-  } satisfies SerializedClientKeys);
-};
-
-export const deserializeClientKeys = (serialized: string) => {
-  const zodRes = serializedClientKeysSchema.safeParse(JSON.parse(serialized));
-  if (zodRes.success) {
-    return {
-      encryptKeyBase64: zodRes.data.encryptKey,
-      decryptKeyBase64: zodRes.data.decryptKey,
-      signKeyBase64: zodRes.data.signKey,
-      verifyKeyBase64: zodRes.data.verifyKey,
-    } satisfies DeserializedClientKeys;
-  }
-  return undefined;
-};
-
-export const storeClientKeys = async (clientKeys: ClientKeys) => {
-  await Promise.all([
-    storeClientKey(clientKeys.encryptKey, "encrypt"),
-    storeClientKey(clientKeys.decryptKey, "decrypt"),
-    storeClientKey(clientKeys.signKey, "sign"),
-    storeClientKey(clientKeys.verifyKey, "verify"),
-  ]);
-};

src/lib/modules/opfs.ts

@@ -59,39 +59,3 @@ export const deleteFile = async (path: string) => {
 
   await parentHandle.removeEntry(filename);
 };
-
-const getDirectoryHandle = async (path: string) => {
-  if (!rootHandle) {
-    throw new Error("OPFS not prepared");
-  } else if (path[0] !== "/") {
-    throw new Error("Path must be absolute");
-  }
-
-  const parts = path.split("/");
-  if (parts.length <= 1) {
-    throw new Error("Invalid path");
-  }
-
-  try {
-    let directoryHandle = rootHandle;
-    let parentHandle;
-    for (const part of parts.slice(1)) {
-      if (!part) continue;
-      parentHandle = directoryHandle;
-      directoryHandle = await directoryHandle.getDirectoryHandle(part);
-    }
-    return { directoryHandle, parentHandle };
-  } catch (e) {
-    if (e instanceof DOMException && e.name === "NotFoundError") {
-      return {};
-    }
-    throw e;
-  }
-};
-
-export const deleteDirectory = async (path: string) => {
-  const { directoryHandle, parentHandle } = await getDirectoryHandle(path);
-  if (!parentHandle) return;
-
-  await parentHandle.removeEntry(directoryHandle.name, { recursive: true });
-};

src/lib/modules/thumbnail.ts

@@ -1,127 +0,0 @@
-import { encodeToBase64 } from "$lib/modules/crypto";
-
-const scaleSize = (width: number, height: number, targetSize: number) => {
-  if (width <= targetSize || height <= targetSize) {
-    return { width, height };
-  }
-
-  const scale = targetSize / Math.min(width, height);
-  return {
-    width: Math.round(width * scale),
-    height: Math.round(height * scale),
-  };
-};
-
-const capture = (
-  width: number,
-  height: number,
-  drawer: (context: CanvasRenderingContext2D, width: number, height: number) => void,
-  targetSize = 250,
-) => {
-  return new Promise<Blob>((resolve, reject) => {
-    const canvas = document.createElement("canvas");
-    const { width: scaledWidth, height: scaledHeight } = scaleSize(width, height, targetSize);
-
-    canvas.width = scaledWidth;
-    canvas.height = scaledHeight;
-
-    const context = canvas.getContext("2d");
-    if (!context) {
-      return reject(new Error("Failed to generate thumbnail"));
-    }
-
-    drawer(context, scaledWidth, scaledHeight);
-    canvas.toBlob((blob) => {
-      if (blob && blob.type === "image/webp") {
-        resolve(blob);
-      } else {
-        reject(new Error("Failed to generate thumbnail"));
-      }
-    }, "image/webp");
-  });
-};
-
-const generateImageThumbnail = (imageUrl: string) => {
-  return new Promise<Blob>((resolve, reject) => {
-    const image = new Image();
-    image.onload = () => {
-      capture(image.width, image.height, (context, width, height) => {
-        context.drawImage(image, 0, 0, width, height);
-      })
-        .then(resolve)
-        .catch(reject);
-    };
-    image.onerror = reject;
-
-    image.src = imageUrl;
-  });
-};
-
-export const captureVideoThumbnail = (video: HTMLVideoElement) => {
-  return capture(video.videoWidth, video.videoHeight, (context, width, height) => {
-    context.drawImage(video, 0, 0, width, height);
-  });
-};
-
-const generateVideoThumbnail = (videoUrl: string, time = 0) => {
-  return new Promise<Blob>((resolve, reject) => {
-    const video = document.createElement("video");
-    video.onloadedmetadata = () => {
-      if (video.videoWidth === 0 || video.videoHeight === 0) {
-        return reject();
-      }
-
-      const callbackId = video.requestVideoFrameCallback(() => {
-        captureVideoThumbnail(video).then(resolve).catch(reject);
-        video.cancelVideoFrameCallback(callbackId);
-      });
-      video.currentTime = Math.min(time, video.duration);
-    };
-    video.onerror = reject;
-
-    video.muted = true;
-    video.playsInline = true;
-    video.src = videoUrl;
-  });
-};
-
-export const generateThumbnail = async (fileBuffer: ArrayBuffer, fileType: string) => {
-  let url;
-  try {
-    if (fileType.startsWith("image/")) {
-      const fileBlob = new Blob([fileBuffer], { type: fileType });
-      url = URL.createObjectURL(fileBlob);
-
-      try {
-        return await generateImageThumbnail(url);
-      } catch {
-        URL.revokeObjectURL(url);
-        url = undefined;
-
-        if (fileType === "image/heic") {
-          const { default: heic2any } = await import("heic2any");
-          url = URL.createObjectURL(
-            (await heic2any({ blob: fileBlob, toType: "image/png" })) as Blob,
-          );
-          return await generateImageThumbnail(url);
-        } else {
-          return null;
-        }
-      }
-    } else if (fileType.startsWith("video/")) {
-      url = URL.createObjectURL(new Blob([fileBuffer], { type: fileType }));
-      return await generateVideoThumbnail(url);
-    }
-    return null;
-  } catch {
-    return null;
-  } finally {
-    if (url) {
-      URL.revokeObjectURL(url);
-    }
-  }
-};
-
-export const getThumbnailUrl = (thumbnailBuffer: ArrayBuffer) => {
-  return `data:image/webp;base64,${encodeToBase64(thumbnailBuffer)}`;
-};

src/lib/server/db/category.ts

@@ -17,7 +17,7 @@ interface Category {
 export type NewCategory = Omit<Category, "id">;
 
 export const registerCategory = async (params: NewCategory) => {
-  return await db.transaction().execute(async (trx) => {
+  await db.transaction().execute(async (trx) => {
     const mek = await trx
       .selectFrom("master_encryption_key")
       .select("version")
@@ -51,7 +51,6 @@ export const registerCategory = async (params: NewCategory) => {
         new_name: params.encName,
       })
       .execute();
-    return { id: categoryId };
   });
 };
 

src/lib/server/db/client.ts

@@ -178,7 +178,7 @@ export const registerUserClientChallenge = async (
   allowedIp: string,
   expiresAt: Date,
 ) => {
-  const { id } = await db
+  await db
     .insertInto("user_client_challenge")
     .values({
       user_id: userId,
@@ -187,25 +187,19 @@ export const registerUserClientChallenge = async (
       allowed_ip: allowedIp,
       expires_at: expiresAt,
     })
-    .returning("id")
+    .execute();
-    .executeTakeFirstOrThrow();
-  return { id };
 };
 
-export const consumeUserClientChallenge = async (
+export const consumeUserClientChallenge = async (userId: number, answer: string, ip: string) => {
-  challengeId: number,
-  userId: number,
-  ip: string,
-) => {
   const challenge = await db
     .deleteFrom("user_client_challenge")
-    .where("id", "=", challengeId)
     .where("user_id", "=", userId)
+    .where("answer", "=", answer)
     .where("allowed_ip", "=", ip)
     .where("expires_at", ">", new Date())
-    .returning(["client_id", "answer"])
+    .returning("client_id")
     .executeTakeFirst();
-  return challenge ? { clientId: challenge.client_id, answer: challenge.answer } : null;
+  return challenge ? { clientId: challenge.client_id } : null;
 };
 
 export const cleanupExpiredUserClientChallenges = async () => {

src/lib/server/db/file.ts

@@ -39,7 +39,7 @@ interface File {
 export type NewFile = Omit<File, "id">;
 
 export const registerDirectory = async (params: NewDirectory) => {
-  return await db.transaction().execute(async (trx) => {
+  await db.transaction().execute(async (trx) => {
     const mek = await trx
       .selectFrom("master_encryption_key")
       .select("version")
@@ -73,7 +73,6 @@ export const registerDirectory = async (params: NewDirectory) => {
         new_name: params.encName,
       })
       .execute();
-    return { id: directoryId };
   });
 };
 
@@ -164,27 +163,16 @@ export const unregisterDirectory = async (userId: number, directoryId: number) =
     .setIsolationLevel("repeatable read") // TODO: Sufficient?
     .execute(async (trx) => {
       const unregisterFiles = async (parentId: number) => {
-        const files = await trx
+        return await trx
-          .selectFrom("file")
-          .leftJoin("thumbnail", "file.id", "thumbnail.file_id")
-          .select(["file.id", "file.path", "thumbnail.path as thumbnailPath"])
-          .where("file.parent_id", "=", parentId)
-          .where("file.user_id", "=", userId)
-          .forUpdate("file")
-          .execute();
-        await trx
           .deleteFrom("file")
           .where("parent_id", "=", parentId)
           .where("user_id", "=", userId)
+          .returning(["id", "path"])
           .execute();
-        return files;
       };
       const unregisterDirectoryRecursively = async (
         directoryId: number,
-      ): Promise<{
+      ): Promise<{ id: number; path: string }[]> => {
-        subDirectories: { id: number }[];
-        files: { id: number; path: string; thumbnailPath: string | null }[];
-      }> => {
         const files = await unregisterFiles(directoryId);
         const subDirectories = await trx
           .selectFrom("directory")
@@ -192,7 +180,7 @@ export const unregisterDirectory = async (userId: number, directoryId: number) =
           .where("parent_id", "=", directoryId)
           .where("user_id", "=", userId)
           .execute();
-        const subDirectoryEntries = await Promise.all(
+        const subDirectoryFilePaths = await Promise.all(
           subDirectories.map(async ({ id }) => await unregisterDirectoryRecursively(id)),
         );
 
@@ -204,12 +192,7 @@ export const unregisterDirectory = async (userId: number, directoryId: number) =
         if (deleteRes.numDeletedRows === 0n) {
           throw new IntegrityError("Directory not found");
         }
-        return {
+        return files.concat(...subDirectoryFilePaths);
-          subDirectories: subDirectoryEntries
-            .flatMap(({ subDirectories }) => subDirectories)
-            .concat(subDirectories),
-          files: subDirectoryEntries.flatMap(({ files }) => files).concat(files),
-        };
       };
       return await unregisterDirectoryRecursively(directoryId);
     });
@@ -344,17 +327,11 @@ export const getAllFilesByCategory = async (
     .where("user_id", "=", userId)
     .where("file_id", "is not", null)
     .$narrowType<{ file_id: NotNull }>()
-    .orderBy("file_id")
+    .orderBy(["file_id", "depth"])
-    .orderBy("depth")
     .execute();
   return files.map(({ file_id, depth }) => ({ id: file_id, isRecursive: depth > 0 }));
 };
 
-export const getAllFileIds = async (userId: number) => {
-  const files = await db.selectFrom("file").select("id").where("user_id", "=", userId).execute();
-  return files.map(({ id }) => id);
-};
-
 export const getAllFileIdsByContentHmac = async (
   userId: number,
   hskVersion: number,
@@ -367,7 +344,7 @@ export const getAllFileIdsByContentHmac = async (
     .where("hmac_secret_key_version", "=", hskVersion)
     .where("content_hmac", "=", contentHmac)
     .execute();
-  return files.map(({ id }) => id);
+  return files.map(({ id }) => ({ id }));
 };
 
 export const getFile = async (userId: number, fileId: number) => {
@@ -439,22 +416,16 @@ export const setFileEncName = async (
 };
 
 export const unregisterFile = async (userId: number, fileId: number) => {
-  return await db.transaction().execute(async (trx) => {
+  const file = await db
-    const file = await trx
+    .deleteFrom("file")
-      .selectFrom("file")
+    .where("id", "=", fileId)
-      .leftJoin("thumbnail", "file.id", "thumbnail.file_id")
+    .where("user_id", "=", userId)
-      .select(["file.path", "thumbnail.path as thumbnailPath"])
+    .returning("path")
-      .where("file.id", "=", fileId)
-      .where("file.user_id", "=", userId)
-      .forUpdate("file")
     .executeTakeFirst();
   if (!file) {
     throw new IntegrityError("File not found");
   }
-
+  return { path: file.path };
-    await trx.deleteFrom("file").where("id", "=", fileId).execute();
-    return file;
-  });
 };
 
 export const addFileToCategory = async (fileId: number, categoryId: number) => {

src/lib/server/db/media.ts

@@ -1,110 +0,0 @@
-import type { NotNull } from "kysely";
-import { IntegrityError } from "./error";
-import db from "./kysely";
-
-interface Thumbnail {
-  id: number;
-  path: string;
-  updatedAt: Date;
-  encContentIv: string;
-}
-
-interface FileThumbnail extends Thumbnail {
-  fileId: number;
-}
-
-export const updateFileThumbnail = async (
-  userId: number,
-  fileId: number,
-  dekVersion: Date,
-  path: string,
-  encContentIv: string,
-) => {
-  return await db.transaction().execute(async (trx) => {
-    const file = await trx
-      .selectFrom("file")
-      .select("data_encryption_key_version")
-      .where("id", "=", fileId)
-      .where("user_id", "=", userId)
-      .limit(1)
-      .forUpdate()
-      .executeTakeFirst();
-    if (!file) {
-      throw new IntegrityError("File not found");
-    } else if (file.data_encryption_key_version.getTime() !== dekVersion.getTime()) {
-      throw new IntegrityError("Invalid DEK version");
-    }
-
-    const thumbnail = await trx
-      .selectFrom("thumbnail")
-      .select("path as oldPath")
-      .where("file_id", "=", fileId)
-      .limit(1)
-      .forUpdate()
-      .executeTakeFirst();
-    const now = new Date();
-
-    await trx
-      .insertInto("thumbnail")
-      .values({
-        file_id: fileId,
-        path,
-        updated_at: now,
-        encrypted_content_iv: encContentIv,
-      })
-      .onConflict((oc) =>
-        oc.column("file_id").doUpdateSet({
-          path,
-          updated_at: now,
-          encrypted_content_iv: encContentIv,
-        }),
-      )
-      .execute();
-    return thumbnail?.oldPath ?? null;
-  });
-};
-
-export const getFileThumbnail = async (userId: number, fileId: number) => {
-  const thumbnail = await db
-    .selectFrom("thumbnail")
-    .innerJoin("file", "thumbnail.file_id", "file.id")
-    .selectAll("thumbnail")
-    .where("file.id", "=", fileId)
-    .where("file.user_id", "=", userId)
-    .$narrowType<{ file_id: NotNull }>()
-    .limit(1)
-    .executeTakeFirst();
-  return thumbnail
-    ? ({
-        id: thumbnail.id,
-        fileId: thumbnail.file_id,
-        path: thumbnail.path,
-        encContentIv: thumbnail.encrypted_content_iv,
-        updatedAt: thumbnail.updated_at,
-      } satisfies FileThumbnail)
-    : null;
-};
-
-export const getMissingFileThumbnails = async (userId: number, limit: number = 100) => {
-  const files = await db
-    .selectFrom("file")
-    .select("id")
-    .where("user_id", "=", userId)
-    .where((eb) =>
-      eb.or([eb("content_type", "like", "image/%"), eb("content_type", "like", "video/%")]),
-    )
-    .where((eb) =>
-      eb.not(
-        eb.exists(
-          eb
-            .selectFrom("thumbnail")
-            .select("thumbnail.id")
-            .whereRef("thumbnail.file_id", "=", "file.id")
-            .limit(1),
-        ),
-      ),
-    )
-    .limit(limit)
-    .execute();
-  return files.map(({ id }) => id);
-};

src/lib/server/db/migrations/1738409340-AddThumbnail.ts

@@ -1,31 +0,0 @@
-import { Kysely, sql } from "kysely";
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const up = async (db: Kysely<any>) => {
-  // media.ts
-  await db.schema
-    .createTable("thumbnail")
-    .addColumn("id", "integer", (col) => col.primaryKey().generatedAlwaysAsIdentity())
-    .addColumn("directory_id", "integer", (col) =>
-      col.references("directory.id").onDelete("cascade").unique(),
-    )
-    .addColumn("file_id", "integer", (col) =>
-      col.references("file.id").onDelete("cascade").unique(),
-    )
-    .addColumn("category_id", "integer", (col) =>
-      col.references("category.id").onDelete("cascade").unique(),
-    )
-    .addColumn("path", "text", (col) => col.unique().notNull())
-    .addColumn("updated_at", "timestamp(3)", (col) => col.notNull())
-    .addColumn("encrypted_content_iv", "text", (col) => col.notNull())
-    .addCheckConstraint(
-      "thumbnail_ck01",
-      sql`(file_id IS NOT NULL)::integer + (directory_id IS NOT NULL)::integer + (category_id IS NOT NULL)::integer = 1`,
-    )
-    .execute();
-};
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const down = async (db: Kysely<any>) => {
-  await db.schema.dropTable("thumbnail").execute();
-};

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

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

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

@@ -2,7 +2,6 @@ export * from "./category";
 export * from "./client";
 export * from "./file";
 export * from "./hsk";
-export * from "./media";
 export * from "./mek";
 export * from "./session";
 export * from "./user";

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

@@ -1,17 +0,0 @@
-import type { Generated } from "kysely";
-
-interface ThumbnailTable {
-  id: Generated<number>;
-  directory_id: number | null;
-  file_id: number | null;
-  category_id: number | null;
-  path: string;
-  updated_at: Date;
-  encrypted_content_iv: string; // Base64
-}
-
-declare module "./index" {
-  interface Database {
-    thumbnail: ThumbnailTable;
-  }
-}

src/lib/server/db/session.ts

@@ -5,22 +5,31 @@ import db from "./kysely";
 
 export const createSession = async (
   userId: number,
+  clientId: number | null,
   sessionId: string,
   ip: string | null,
   agent: string | null,
 ) => {
+  try {
     const now = new Date();
     await db
       .insertInto("session")
       .values({
         id: sessionId,
         user_id: userId,
+        client_id: clientId,
         created_at: now,
         last_used_at: now,
         last_used_by_ip: ip || null,
         last_used_by_agent: agent || null,
       })
       .execute();
+  } catch (e) {
+    if (e instanceof pg.DatabaseError && e.code === "23505") {
+      throw new IntegrityError("Session already exists");
+    }
+    throw e;
+  }
 };
 
 export const refreshSession = async (
@@ -46,23 +55,8 @@ export const refreshSession = async (
   return { userId: session.user_id, clientId: session.client_id };
 };
 
-export const upgradeSession = async (
+export const upgradeSession = async (sessionId: string, clientId: number) => {
-  userId: number,
+  const res = await db
-  sessionId: string,
-  clientId: number,
-  force: boolean,
-) => {
-  try {
-    await db.transaction().execute(async (trx) => {
-      if (force) {
-        await trx
-          .deleteFrom("session")
-          .where("id", "!=", sessionId)
-          .where("user_id", "=", userId)
-          .where("client_id", "=", clientId)
-          .execute();
-      }
-      const res = await trx
     .updateTable("session")
     .set({ client_id: clientId })
     .where("id", "=", sessionId)
@@ -71,13 +65,6 @@ export const upgradeSession = async (
   if (res.numUpdatedRows === 0n) {
     throw new IntegrityError("Session not found");
   }
-    });
-  } catch (e) {
-    if (e instanceof pg.DatabaseError && e.code === "23505") {
-      throw new IntegrityError("Session already exists");
-    }
-    throw e;
-  }
 };
 
 export const deleteSession = async (sessionId: string) => {
@@ -107,7 +94,7 @@ export const registerSessionUpgradeChallenge = async (
   expiresAt: Date,
 ) => {
   try {
-    const { id } = await db
+    await db
       .insertInto("session_upgrade_challenge")
       .values({
         session_id: sessionId,
@@ -116,9 +103,7 @@ export const registerSessionUpgradeChallenge = async (
         allowed_ip: allowedIp,
         expires_at: expiresAt,
       })
-      .returning("id")
+      .execute();
-      .executeTakeFirstOrThrow();
-    return { id };
   } catch (e) {
     if (e instanceof pg.DatabaseError && e.code === "23505") {
       throw new IntegrityError("Challenge already registered");
@@ -128,19 +113,19 @@ export const registerSessionUpgradeChallenge = async (
 };
 
 export const consumeSessionUpgradeChallenge = async (
-  challengeId: number,
   sessionId: string,
+  answer: string,
   ip: string,
 ) => {
   const challenge = await db
     .deleteFrom("session_upgrade_challenge")
-    .where("id", "=", challengeId)
     .where("session_id", "=", sessionId)
+    .where("answer", "=", answer)
     .where("allowed_ip", "=", ip)
     .where("expires_at", ">", new Date())
-    .returning(["client_id", "answer"])
+    .returning("client_id")
     .executeTakeFirst();
-  return challenge ? { clientId: challenge.client_id, answer: challenge.answer } : null;
+  return challenge ? { clientId: challenge.client_id } : null;
 };
 
 export const cleanupExpiredSessionUpgradeChallenges = async () => {

src/lib/server/loadenv.ts

@@ -25,5 +25,4 @@ export default {
     sessionUpgradeExp: ms(env.SESSION_UPGRADE_CHALLENGE_EXPIRES || "5m"),
   },
   libraryPath: env.LIBRARY_PATH || "library",
-  thumbnailsPath: env.THUMBNAILS_PATH || "thumbnails",
 };

src/lib/server/middlewares/authenticate.ts

@@ -1,5 +1,4 @@
 import { error, redirect, type Handle } from "@sveltejs/kit";
-import env from "$lib/server/loadenv";
 import { authenticate, AuthenticationError } from "$lib/server/modules/auth";
 
 export const authenticateMiddleware: Handle = async ({ event, resolve }) => {
@@ -16,12 +15,6 @@ export const authenticateMiddleware: Handle = async ({ event, resolve }) => {
 
     const { ip, userAgent } = event.locals;
     event.locals.session = await authenticate(sessionIdSigned, ip, userAgent);
-    event.cookies.set("sessionId", sessionIdSigned, {
-      path: "/",
-      maxAge: env.session.exp / 1000,
-      secure: true,
-      sameSite: "strict",
-    });
   } catch (e) {
     if (e instanceof AuthenticationError) {
       if (pathname === "/auth/login") {

src/lib/server/modules/auth.ts

@@ -27,7 +27,7 @@ export class AuthenticationError extends Error {
 
 export const startSession = async (userId: number, ip: string, userAgent: string) => {
   const { sessionId, sessionIdSigned } = await issueSessionId(32, env.session.secret);
-  await createSession(userId, sessionId, ip, userAgent);
+  await createSession(userId, null, sessionId, ip, userAgent);
   return sessionIdSigned;
 };
 

src/lib/server/schemas/auth.ts

@@ -4,29 +4,27 @@ export const passwordChangeRequest = z.object({
   oldPassword: z.string().trim().nonempty(),
   newPassword: z.string().trim().nonempty(),
 });
-export type PasswordChangeRequest = z.input<typeof passwordChangeRequest>;
+export type PasswordChangeRequest = z.infer<typeof passwordChangeRequest>;
 
 export const loginRequest = z.object({
   email: z.string().email(),
   password: z.string().trim().nonempty(),
 });
-export type LoginRequest = z.input<typeof loginRequest>;
+export type LoginRequest = z.infer<typeof loginRequest>;
 
 export const sessionUpgradeRequest = z.object({
   encPubKey: z.string().base64().nonempty(),
   sigPubKey: z.string().base64().nonempty(),
 });
-export type SessionUpgradeRequest = z.input<typeof sessionUpgradeRequest>;
+export type SessionUpgradeRequest = z.infer<typeof sessionUpgradeRequest>;
 
 export const sessionUpgradeResponse = z.object({
-  id: z.number().int().positive(),
   challenge: z.string().base64().nonempty(),
 });
-export type SessionUpgradeResponse = z.output<typeof sessionUpgradeResponse>;
+export type SessionUpgradeResponse = z.infer<typeof sessionUpgradeResponse>;
 
 export const sessionUpgradeVerifyRequest = z.object({
-  id: z.number().int().positive(),
+  answer: z.string().base64().nonempty(),
   answerSig: z.string().base64().nonempty(),
-  force: z.boolean().default(false),
 });
-export type SessionUpgradeVerifyRequest = z.input<typeof sessionUpgradeVerifyRequest>;
+export type SessionUpgradeVerifyRequest = z.infer<typeof sessionUpgradeVerifyRequest>;

src/lib/server/schemas/category.ts

@@ -15,12 +15,12 @@ export const categoryInfoResponse = z.object({
     .optional(),
   subCategories: z.number().int().positive().array(),
 });
-export type CategoryInfoResponse = z.output<typeof categoryInfoResponse>;
+export type CategoryInfoResponse = z.infer<typeof categoryInfoResponse>;
 
 export const categoryFileAddRequest = z.object({
   file: z.number().int().positive(),
 });
-export type CategoryFileAddRequest = z.input<typeof categoryFileAddRequest>;
+export type CategoryFileAddRequest = z.infer<typeof categoryFileAddRequest>;
 
 export const categoryFileListResponse = z.object({
   files: z.array(
@@ -30,19 +30,19 @@ export const categoryFileListResponse = z.object({
     }),
   ),
 });
-export type CategoryFileListResponse = z.output<typeof categoryFileListResponse>;
+export type CategoryFileListResponse = z.infer<typeof categoryFileListResponse>;
 
 export const categoryFileRemoveRequest = z.object({
   file: z.number().int().positive(),
 });
-export type CategoryFileRemoveRequest = z.input<typeof categoryFileRemoveRequest>;
+export type CategoryFileRemoveRequest = z.infer<typeof categoryFileRemoveRequest>;
 
 export const categoryRenameRequest = z.object({
   dekVersion: z.string().datetime(),
   name: z.string().base64().nonempty(),
   nameIv: z.string().base64().nonempty(),
 });
-export type CategoryRenameRequest = z.input<typeof categoryRenameRequest>;
+export type CategoryRenameRequest = z.infer<typeof categoryRenameRequest>;
 
 export const categoryCreateRequest = z.object({
   parent: categoryIdSchema,
@@ -52,9 +52,4 @@ export const categoryCreateRequest = z.object({
   name: z.string().base64().nonempty(),
   nameIv: z.string().base64().nonempty(),
 });
-export type CategoryCreateRequest = z.input<typeof categoryCreateRequest>;
+export type CategoryCreateRequest = z.infer<typeof categoryCreateRequest>;
-
-export const categoryCreateResponse = z.object({
-  category: z.number().int().positive(),
-});
-export type CategoryCreateResponse = z.output<typeof categoryCreateResponse>;

src/lib/server/schemas/client.ts

@@ -8,29 +8,28 @@ export const clientListResponse = z.object({
     }),
   ),
 });
-export type ClientListResponse = z.output<typeof clientListResponse>;
+export type ClientListResponse = z.infer<typeof clientListResponse>;
 
 export const clientRegisterRequest = z.object({
   encPubKey: z.string().base64().nonempty(),
   sigPubKey: z.string().base64().nonempty(),
 });
-export type ClientRegisterRequest = z.input<typeof clientRegisterRequest>;
+export type ClientRegisterRequest = z.infer<typeof clientRegisterRequest>;
 
 export const clientRegisterResponse = z.object({
-  id: z.number().int().positive(),
   challenge: z.string().base64().nonempty(),
 });
-export type ClientRegisterResponse = z.output<typeof clientRegisterResponse>;
+export type ClientRegisterResponse = z.infer<typeof clientRegisterResponse>;
 
 export const clientRegisterVerifyRequest = z.object({
-  id: z.number().int().positive(),
+  answer: z.string().base64().nonempty(),
   answerSig: z.string().base64().nonempty(),
 });
-export type ClientRegisterVerifyRequest = z.input<typeof clientRegisterVerifyRequest>;
+export type ClientRegisterVerifyRequest = z.infer<typeof clientRegisterVerifyRequest>;
 
 export const clientStatusResponse = z.object({
   id: z.number().int().positive(),
   state: z.enum(["pending", "active"]),
   isInitialMekNeeded: z.boolean(),
 });
-export type ClientStatusResponse = z.output<typeof clientStatusResponse>;
+export type ClientStatusResponse = z.infer<typeof clientStatusResponse>;

src/lib/server/schemas/directory.ts

@@ -16,20 +16,19 @@ export const directoryInfoResponse = z.object({
   subDirectories: z.number().int().positive().array(),
   files: z.number().int().positive().array(),
 });
-export type DirectoryInfoResponse = z.output<typeof directoryInfoResponse>;
+export type DirectoryInfoResponse = z.infer<typeof directoryInfoResponse>;
 
 export const directoryDeleteResponse = z.object({
-  deletedDirectories: z.number().int().positive().array(),
   deletedFiles: z.number().int().positive().array(),
 });
-export type DirectoryDeleteResponse = z.output<typeof directoryDeleteResponse>;
+export type DirectoryDeleteResponse = z.infer<typeof directoryDeleteResponse>;
 
 export const directoryRenameRequest = z.object({
   dekVersion: z.string().datetime(),
   name: z.string().base64().nonempty(),
   nameIv: z.string().base64().nonempty(),
 });
-export type DirectoryRenameRequest = z.input<typeof directoryRenameRequest>;
+export type DirectoryRenameRequest = z.infer<typeof directoryRenameRequest>;
 
 export const directoryCreateRequest = z.object({
   parent: directoryIdSchema,
@@ -39,9 +38,4 @@ export const directoryCreateRequest = z.object({
   name: z.string().base64().nonempty(),
   nameIv: z.string().base64().nonempty(),
 });
-export type DirectoryCreateRequest = z.input<typeof directoryCreateRequest>;
+export type DirectoryCreateRequest = z.infer<typeof directoryCreateRequest>;
-
-export const directoryCreateResponse = z.object({
-  directory: z.number().int().positive(),
-});
-export type DirectoryCreateResponse = z.output<typeof directoryCreateResponse>;

src/lib/server/schemas/file.ts

@@ -21,47 +21,25 @@ export const fileInfoResponse = z.object({
   lastModifiedAtIv: z.string().base64().nonempty(),
   categories: z.number().int().positive().array(),
 });
-export type FileInfoResponse = z.output<typeof fileInfoResponse>;
+export type FileInfoResponse = z.infer<typeof fileInfoResponse>;
 
 export const fileRenameRequest = z.object({
   dekVersion: z.string().datetime(),
   name: z.string().base64().nonempty(),
   nameIv: z.string().base64().nonempty(),
 });
-export type FileRenameRequest = z.input<typeof fileRenameRequest>;
+export type FileRenameRequest = z.infer<typeof fileRenameRequest>;
-
-export const fileThumbnailInfoResponse = z.object({
-  updatedAt: z.string().datetime(),
-  contentIv: z.string().base64().nonempty(),
-});
-export type FileThumbnailInfoResponse = z.output<typeof fileThumbnailInfoResponse>;
-
-export const fileThumbnailUploadRequest = z.object({
-  dekVersion: z.string().datetime(),
-  contentIv: z.string().base64().nonempty(),
-});
-export type FileThumbnailUploadRequest = z.input<typeof fileThumbnailUploadRequest>;
-
-export const fileListResponse = z.object({
-  files: z.number().int().positive().array(),
-});
-export type FileListResponse = z.output<typeof fileListResponse>;
 
 export const duplicateFileScanRequest = z.object({
   hskVersion: z.number().int().positive(),
   contentHmac: z.string().base64().nonempty(),
 });
-export type DuplicateFileScanRequest = z.input<typeof duplicateFileScanRequest>;
+export type DuplicateFileScanRequest = z.infer<typeof duplicateFileScanRequest>;
 
 export const duplicateFileScanResponse = z.object({
   files: z.number().int().positive().array(),
 });
-export type DuplicateFileScanResponse = z.output<typeof duplicateFileScanResponse>;
+export type DuplicateFileScanResponse = z.infer<typeof duplicateFileScanResponse>;
-
-export const missingThumbnailFileScanResponse = z.object({
-  files: z.number().int().positive().array(),
-});
-export type MissingThumbnailFileScanResponse = z.output<typeof missingThumbnailFileScanResponse>;
 
 export const fileUploadRequest = z.object({
   parent: directoryIdSchema,
@@ -83,9 +61,9 @@ export const fileUploadRequest = z.object({
   lastModifiedAt: z.string().base64().nonempty(),
   lastModifiedAtIv: z.string().base64().nonempty(),
 });
-export type FileUploadRequest = z.input<typeof fileUploadRequest>;
+export type FileUploadRequest = z.infer<typeof fileUploadRequest>;
 
 export const fileUploadResponse = z.object({
   file: z.number().int().positive(),
 });
-export type FileUploadResponse = z.output<typeof fileUploadResponse>;
+export type FileUploadResponse = z.infer<typeof fileUploadResponse>;

src/lib/server/schemas/hsk.ts

@@ -10,10 +10,10 @@ export const hmacSecretListResponse = z.object({
     }),
   ),
 });
-export type HmacSecretListResponse = z.output<typeof hmacSecretListResponse>;
+export type HmacSecretListResponse = z.infer<typeof hmacSecretListResponse>;
 
 export const initialHmacSecretRegisterRequest = z.object({
   mekVersion: z.number().int().positive(),
   hsk: z.string().base64().nonempty(),
 });
-export type InitialHmacSecretRegisterRequest = z.input<typeof initialHmacSecretRegisterRequest>;
+export type InitialHmacSecretRegisterRequest = z.infer<typeof initialHmacSecretRegisterRequest>;

src/lib/server/schemas/mek.ts

@@ -10,10 +10,10 @@ export const masterKeyListResponse = z.object({
     }),
   ),
 });
-export type MasterKeyListResponse = z.output<typeof masterKeyListResponse>;
+export type MasterKeyListResponse = z.infer<typeof masterKeyListResponse>;
 
 export const initialMasterKeyRegisterRequest = z.object({
   mek: z.string().base64().nonempty(),
   mekSig: z.string().base64().nonempty(),
 });
-export type InitialMasterKeyRegisterRequest = z.input<typeof initialMasterKeyRegisterRequest>;
+export type InitialMasterKeyRegisterRequest = z.infer<typeof initialMasterKeyRegisterRequest>;

src/lib/server/schemas/user.ts

@@ -4,9 +4,9 @@ export const userInfoResponse = z.object({
   email: z.string().email(),
   nickname: z.string().nonempty(),
 });
-export type UserInfoResponse = z.output<typeof userInfoResponse>;
+export type UserInfoResponse = z.infer<typeof userInfoResponse>;
 
 export const nicknameChangeRequest = z.object({
   newNickname: z.string().trim().min(2).max(8),
 });
-export type NicknameChangeRequest = z.input<typeof nicknameChangeRequest>;
+export type NicknameChangeRequest = z.infer<typeof nicknameChangeRequest>;

src/lib/server/services/auth.ts

@@ -51,7 +51,14 @@ export const login = async (email: string, password: string, ip: string, userAge
     error(401, "Invalid email or password");
   }
 
+  try {
     return { sessionIdSigned: await startSession(user.id, ip, userAgent) };
+  } catch (e) {
+    if (e instanceof IntegrityError && e.message === "Session already exists") {
+      error(403, "Already logged in");
+    }
+    throw e;
+  }
 };
 
 export const logout = async (sessionId: string) => {
@@ -74,7 +81,7 @@ export const createSessionUpgradeChallenge = async (
   }
 
   const { answer, challenge } = await generateChallenge(32, encPubKey);
-  const { id } = await registerSessionUpgradeChallenge(
+  await registerSessionUpgradeChallenge(
     sessionId,
     client.id,
     answer.toString("base64"),
@@ -82,18 +89,16 @@ export const createSessionUpgradeChallenge = async (
     new Date(Date.now() + env.challenge.sessionUpgradeExp),
   );
 
-  return { id, challenge: challenge.toString("base64") };
+  return { challenge: challenge.toString("base64") };
 };
 
 export const verifySessionUpgradeChallenge = async (
   sessionId: string,
-  userId: number,
   ip: string,
-  challengeId: number,
+  answer: string,
   answerSig: string,
-  force: boolean,
 ) => {
-  const challenge = await consumeSessionUpgradeChallenge(challengeId, sessionId, ip);
+  const challenge = await consumeSessionUpgradeChallenge(sessionId, answer, ip);
   if (!challenge) {
     error(403, "Invalid challenge answer");
   }
@@ -101,21 +106,15 @@ export const verifySessionUpgradeChallenge = async (
   const client = await getClient(challenge.clientId);
   if (!client) {
     error(500, "Invalid challenge answer");
-  } else if (
+  } else if (!verifySignature(Buffer.from(answer, "base64"), answerSig, client.sigPubKey)) {
-    !verifySignature(Buffer.from(challenge.answer, "base64"), answerSig, client.sigPubKey)
-  ) {
     error(403, "Invalid challenge answer signature");
   }
 
   try {
-    await upgradeSession(userId, sessionId, client.id, force);
+    await upgradeSession(sessionId, client.id);
   } catch (e) {
-    if (e instanceof IntegrityError) {
+    if (e instanceof IntegrityError && e.message === "Session not found") {
-      if (e.message === "Session not found") {
       error(500, "Invalid challenge answer");
-      } else if (!force && e.message === "Session already exists") {
-        error(409, "Already logged in");
-      }
     }
     throw e;
   }

src/lib/server/services/category.ts

@@ -123,8 +123,7 @@ export const createCategory = async (params: NewCategory) => {
   }
 
   try {
-    const { id } = await registerCategory(params);
+    await registerCategory(params);
-    return { id };
   } catch (e) {
     if (e instanceof IntegrityError && e.message === "Inactive MEK version") {
       error(400, "Inactive MEK version");

src/lib/server/services/client.ts

@@ -34,14 +34,8 @@ const createUserClientChallenge = async (
   encPubKey: string,
 ) => {
   const { answer, challenge } = await generateChallenge(32, encPubKey);
-  const { id } = await registerUserClientChallenge(
+  await registerUserClientChallenge(userId, clientId, answer.toString("base64"), ip, expiresAt());
-    userId,
+  return challenge.toString("base64");
-    clientId,
-    answer.toString("base64"),
-    ip,
-    expiresAt(),
-  );
-  return { id, challenge: challenge.toString("base64") };
 };
 
 export const registerUserClient = async (
@@ -54,7 +48,7 @@ export const registerUserClient = async (
   if (client) {
     try {
       await createUserClient(userId, client.id);
-      return await createUserClientChallenge(ip, userId, client.id, encPubKey);
+      return { challenge: await createUserClientChallenge(ip, userId, client.id, encPubKey) };
     } catch (e) {
       if (e instanceof IntegrityError && e.message === "User client already exists") {
         error(409, "Client already registered");
@@ -70,7 +64,7 @@ export const registerUserClient = async (
 
     try {
       const { id: clientId } = await createClient(encPubKey, sigPubKey, userId);
-      return await createUserClientChallenge(ip, userId, clientId, encPubKey);
+      return { challenge: await createUserClientChallenge(ip, userId, clientId, encPubKey) };
     } catch (e) {
       if (e instanceof IntegrityError && e.message === "Public key(s) already registered") {
         error(409, "Public key(s) already used");
@@ -83,10 +77,10 @@ export const registerUserClient = async (
 export const verifyUserClient = async (
   userId: number,
   ip: string,
-  challengeId: number,
+  answer: string,
   answerSig: string,
 ) => {
-  const challenge = await consumeUserClientChallenge(challengeId, userId, ip);
+  const challenge = await consumeUserClientChallenge(userId, answer, ip);
   if (!challenge) {
     error(403, "Invalid challenge answer");
   }
@@ -94,9 +88,7 @@ export const verifyUserClient = async (
   const client = await getClient(challenge.clientId);
   if (!client) {
     error(500, "Invalid challenge answer");
-  } else if (
+  } else if (!verifySignature(Buffer.from(answer, "base64"), answerSig, client.sigPubKey)) {
-    !verifySignature(Buffer.from(challenge.answer, "base64"), answerSig, client.sigPubKey)
-  ) {
     error(403, "Invalid challenge answer signature");
   }
 

src/lib/server/services/directory.ts

@@ -34,20 +34,12 @@ export const getDirectoryInformation = async (userId: number, directoryId: Direc
   };
 };
 
-const safeUnlink = async (path: string | null) => {
-  if (path) {
-    await unlink(path).catch(console.error);
-  }
-};
-
 export const deleteDirectory = async (userId: number, directoryId: number) => {
   try {
-    const { subDirectories, files } = await unregisterDirectory(userId, directoryId);
+    const files = await unregisterDirectory(userId, directoryId);
     return {
-      directories: [...subDirectories.map(({ id }) => id), directoryId],
+      files: files.map(({ id, path }) => {
-      files: files.map(({ id, path, thumbnailPath }) => {
+        unlink(path); // Intended
-        safeUnlink(path); // Intended
-        safeUnlink(thumbnailPath); // Intended
         return id;
       }),
     };
@@ -87,8 +79,7 @@ export const createDirectory = async (params: NewDirectory) => {
   }
 
   try {
-    const { id } = await registerDirectory(params);
+    await registerDirectory(params);
-    return { id };
   } catch (e) {
     if (e instanceof IntegrityError && e.message === "Inactive MEK version") {
       error(400, "Invalid MEK version");

src/lib/server/services/file.ts

@@ -9,7 +9,6 @@ import { v4 as uuidv4 } from "uuid";
 import { IntegrityError } from "$lib/server/db/error";
 import {
   registerFile,
-  getAllFileIds,
   getAllFileIdsByContentHmac,
   getFile,
   setFileEncName,
@@ -17,11 +16,6 @@ import {
   getAllFileCategories,
   type NewFile,
 } from "$lib/server/db/file";
-import {
-  updateFileThumbnail,
-  getFileThumbnail,
-  getMissingFileThumbnails,
-} from "$lib/server/db/media";
 import type { Ciphertext } from "$lib/server/db/schema";
 import env from "$lib/server/loadenv";
 
@@ -46,17 +40,10 @@ export const getFileInformation = async (userId: number, fileId: number) => {
   };
 };
 
-const safeUnlink = async (path: string | null) => {
-  if (path) {
-    await unlink(path).catch(console.error);
-  }
-};
-
 export const deleteFile = async (userId: number, fileId: number) => {
   try {
-    const { path, thumbnailPath } = await unregisterFile(userId, fileId);
+    const { path } = await unregisterFile(userId, fileId);
-    safeUnlink(path); // Intended
+    unlink(path); // Intended
-    safeUnlink(thumbnailPath); // Intended
   } catch (e) {
     if (e instanceof IntegrityError && e.message === "File not found") {
       error(404, "Invalid file id");
@@ -98,74 +85,17 @@ export const renameFile = async (
   }
 };
 
-export const getFileThumbnailInformation = async (userId: number, fileId: number) => {
-  const thumbnail = await getFileThumbnail(userId, fileId);
-  if (!thumbnail) {
-    error(404, "File or its thumbnail not found");
-  }
-
-  return { updatedAt: thumbnail.updatedAt, encContentIv: thumbnail.encContentIv };
-};
-
-export const getFileThumbnailStream = async (userId: number, fileId: number) => {
-  const thumbnail = await getFileThumbnail(userId, fileId);
-  if (!thumbnail) {
-    error(404, "File or its thumbnail not found");
-  }
-
-  const { size } = await stat(thumbnail.path);
-  return {
-    encContentStream: Readable.toWeb(createReadStream(thumbnail.path)),
-    encContentSize: size,
-  };
-};
-
-export const uploadFileThumbnail = async (
-  userId: number,
-  fileId: number,
-  dekVersion: Date,
-  encContentIv: string,
-  encContentStream: Readable,
-) => {
-  const path = `${env.thumbnailsPath}/${userId}/${uuidv4()}`;
-  await mkdir(dirname(path), { recursive: true });
-
-  try {
-    await pipeline(encContentStream, createWriteStream(path, { flags: "wx", mode: 0o600 }));
-
-    const oldPath = await updateFileThumbnail(userId, fileId, dekVersion, path, encContentIv);
-    safeUnlink(oldPath); // Intended
-  } catch (e) {
-    await safeUnlink(path);
-
-    if (e instanceof IntegrityError) {
-      if (e.message === "File not found") {
-        error(404, "File not found");
-      } else if (e.message === "Invalid DEK version") {
-        error(400, "Mismatched DEK version");
-      }
-    }
-    throw e;
-  }
-};
-
-export const getFileList = async (userId: number) => {
-  const fileIds = await getAllFileIds(userId);
-  return { files: fileIds };
-};
-
 export const scanDuplicateFiles = async (
   userId: number,
   hskVersion: number,
   contentHmac: string,
 ) => {
   const fileIds = await getAllFileIdsByContentHmac(userId, hskVersion, contentHmac);
-  return { files: fileIds };
+  return { files: fileIds.map(({ id }) => id) };
 };
 
-export const scanMissingFileThumbnails = async (userId: number) => {
+const safeUnlink = async (path: string) => {
-  const fileIds = await getMissingFileThumbnails(userId);
+  await unlink(path).catch(console.error);
-  return { files: fileIds };
 };
 
 export const uploadFile = async (

src/lib/services/auth.ts

@@ -11,29 +11,20 @@ export const requestSessionUpgrade = async (
   decryptKey: CryptoKey,
   verifyKeyBase64: string,
   signKey: CryptoKey,
-  force = false,
 ) => {
   let res = await callPostApi<SessionUpgradeRequest>("/api/auth/upgradeSession", {
     encPubKey: encryptKeyBase64,
     sigPubKey: verifyKeyBase64,
   });
-  if (res.status === 403) return [false, "Unregistered client"] as const;
+  if (!res.ok) return false;
-  else if (!res.ok) return [false] as const;
 
-  const { id, challenge }: SessionUpgradeResponse = await res.json();
+  const { challenge }: SessionUpgradeResponse = await res.json();
   const answer = await decryptChallenge(challenge, decryptKey);
   const answerSig = await signMessageRSA(answer, signKey);
 
   res = await callPostApi<SessionUpgradeVerifyRequest>("/api/auth/upgradeSession/verify", {
-    id,
+    answer: encodeToBase64(answer),
     answerSig: encodeToBase64(answerSig),
-    force,
   });
-  if (res.status === 409) return [false, "Already logged in"] as const;
-  else return [res.ok] as const;
-};
-
-export const requestLogout = async () => {
-  const res = await callPostApi("/api/auth/logout");
   return res.ok;
 };

src/lib/services/file.ts

@@ -1,83 +0,0 @@
-import { callGetApi } from "$lib/hooks";
-import { getAllFileInfos } from "$lib/indexedDB/filesystem";
-import { decryptData } from "$lib/modules/crypto";
-import {
-  getFileCache,
-  storeFileCache,
-  deleteFileCache,
-  getFileThumbnailCache,
-  storeFileThumbnailCache,
-  deleteFileThumbnailCache,
-  downloadFile,
-} from "$lib/modules/file";
-import { getThumbnailUrl } from "$lib/modules/thumbnail";
-import type {
-  FileThumbnailInfoResponse,
-  FileThumbnailUploadRequest,
-  FileListResponse,
-} from "$lib/server/schemas";
-
-export const requestFileDownload = async (
-  fileId: number,
-  fileEncryptedIv: string,
-  dataKey: CryptoKey,
-) => {
-  const cache = await getFileCache(fileId);
-  if (cache) return cache;
-
-  const fileBuffer = await downloadFile(fileId, fileEncryptedIv, dataKey);
-  storeFileCache(fileId, fileBuffer); // Intended
-  return fileBuffer;
-};
-
-export const requestFileThumbnailUpload = async (
-  fileId: number,
-  dataKeyVersion: Date,
-  thumbnailEncrypted: { ciphertext: ArrayBuffer; iv: string },
-) => {
-  const form = new FormData();
-  form.set(
-    "metadata",
-    JSON.stringify({
-      dekVersion: dataKeyVersion.toISOString(),
-      contentIv: thumbnailEncrypted.iv,
-    } satisfies FileThumbnailUploadRequest),
-  );
-  form.set("content", new Blob([thumbnailEncrypted.ciphertext]));
-
-  return await fetch(`/api/file/${fileId}/thumbnail/upload`, { method: "POST", body: form });
-};
-
-export const requestFileThumbnailDownload = async (fileId: number, dataKey: CryptoKey) => {
-  const cache = await getFileThumbnailCache(fileId);
-  if (cache) return cache;
-
-  let res = await callGetApi(`/api/file/${fileId}/thumbnail`);
-  if (!res.ok) return null;
-
-  const { contentIv: thumbnailEncryptedIv }: FileThumbnailInfoResponse = await res.json();
-
-  res = await callGetApi(`/api/file/${fileId}/thumbnail/download`);
-  if (!res.ok) return null;
-
-  const thumbnailEncrypted = await res.arrayBuffer();
-  const thumbnailBuffer = await decryptData(thumbnailEncrypted, thumbnailEncryptedIv, dataKey);
-
-  storeFileThumbnailCache(fileId, thumbnailBuffer); // Intended
-  return getThumbnailUrl(thumbnailBuffer);
-};
-
-export const requestDeletedFilesCleanup = async () => {
-  const res = await callGetApi("/api/file/list");
-  if (!res.ok) return;
-
-  const { files: liveFiles }: FileListResponse = await res.json();
-  const liveFilesSet = new Set(liveFiles);
-  const maybeCachedFiles = await getAllFileInfos();
-
-  await Promise.all(
-    maybeCachedFiles
-      .filter(({ id }) => !liveFilesSet.has(id))
-      .flatMap(({ id }) => [deleteFileCache(id), deleteFileThumbnailCache(id)]),
-  );
-};

src/lib/services/key.ts

@@ -2,23 +2,18 @@ import { callGetApi, callPostApi } from "$lib/hooks";
 import { storeMasterKeys } from "$lib/indexedDB";
 import {
   encodeToBase64,
-  exportRSAKeyToBase64,
   decryptChallenge,
   signMessageRSA,
   unwrapMasterKey,
-  signMasterKeyWrapped,
   verifyMasterKeyWrapped,
 } from "$lib/modules/crypto";
 import type {
   ClientRegisterRequest,
   ClientRegisterResponse,
   ClientRegisterVerifyRequest,
-  InitialHmacSecretRegisterRequest,
   MasterKeyListResponse,
-  InitialMasterKeyRegisterRequest,
 } from "$lib/server/schemas";
-import { requestSessionUpgrade } from "$lib/services/auth";
+import { masterKeyStore } from "$lib/stores";
-import { masterKeyStore, type ClientKeys } from "$lib/stores";
 
 export const requestClientRegistration = async (
   encryptKeyBase64: string,
@@ -32,46 +27,17 @@ export const requestClientRegistration = async (
   });
   if (!res.ok) return false;
 
-  const { id, challenge }: ClientRegisterResponse = await res.json();
+  const { challenge }: ClientRegisterResponse = await res.json();
   const answer = await decryptChallenge(challenge, decryptKey);
   const answerSig = await signMessageRSA(answer, signKey);
 
   res = await callPostApi<ClientRegisterVerifyRequest>("/api/client/register/verify", {
-    id,
+    answer: encodeToBase64(answer),
     answerSig: encodeToBase64(answerSig),
   });
   return res.ok;
 };
 
-export const requestClientRegistrationAndSessionUpgrade = async (
-  { encryptKey, decryptKey, signKey, verifyKey }: ClientKeys,
-  force: boolean,
-) => {
-  const encryptKeyBase64 = await exportRSAKeyToBase64(encryptKey);
-  const verifyKeyBase64 = await exportRSAKeyToBase64(verifyKey);
-  const [res, error] = await requestSessionUpgrade(
-    encryptKeyBase64,
-    decryptKey,
-    verifyKeyBase64,
-    signKey,
-    force,
-  );
-  if (error === undefined) return [res] as const;
-
-  if (
-    error === "Unregistered client" &&
-    !(await requestClientRegistration(encryptKeyBase64, decryptKey, verifyKeyBase64, signKey))
-  ) {
-    return [false] as const;
-  } else if (error === "Already logged in") {
-    return [false, force ? undefined : error] as const;
-  }
-
-  return [
-    (await requestSessionUpgrade(encryptKeyBase64, decryptKey, verifyKeyBase64, signKey))[0],
-  ] as const;
-};
-
 export const requestMasterKeyDownload = async (decryptKey: CryptoKey, verifyKey: CryptoKey) => {
   const res = await callGetApi("/api/mek/list");
   if (!res.ok) return false;
@@ -102,23 +68,3 @@ export const requestMasterKeyDownload = async (decryptKey: CryptoKey, verifyKey:
 
   return true;
 };
-
-export const requestInitialMasterKeyAndHmacSecretRegistration = async (
-  masterKeyWrapped: string,
-  hmacSecretWrapped: string,
-  signKey: CryptoKey,
-) => {
-  let res = await callPostApi<InitialMasterKeyRegisterRequest>("/api/mek/register/initial", {
-    mek: masterKeyWrapped,
-    mekSig: await signMasterKeyWrapped(masterKeyWrapped, 1, signKey),
-  });
-  if (!res.ok) {
-    return res.status === 403 || res.status === 409;
-  }
-
-  res = await callPostApi<InitialHmacSecretRegisterRequest>("/api/hsk/register/initial", {
-    mekVersion: 1,
-    hsk: hmacSecretWrapped,
-  });
-  return res.ok;
-};

src/routes/(fullscreen)/auth/changePassword/+page.svelte

@@ -6,14 +6,8 @@
 
   let oldPassword = $state("");
   let newPassword = $state("");
-  let confirmPassword = $state("");
 
   const changePassword = async () => {
-    if (newPassword !== confirmPassword) {
-      // TODO: Alert
-      return;
-    }
-
     if (await requestPasswordChange(oldPassword, newPassword)) {
       await goto("/menu");
     }
@@ -36,7 +30,6 @@
 
     <TextInput bind:value={oldPassword} placeholder="기존 비밀번호" type="password" />
     <TextInput bind:value={newPassword} placeholder="새 비밀번호" type="password" />
-    <TextInput bind:value={confirmPassword} placeholder="새 비밀번호 확인" type="password" />
   </TitledDiv>
   <BottomDiv>
     <Button onclick={changePassword} class="w-full">비밀번호 바꾸기</Button>

src/routes/(fullscreen)/auth/login/+page.svelte

@@ -2,57 +2,18 @@
   import { goto } from "$app/navigation";
   import { BottomDiv, Button, FullscreenDiv, TextButton, TextInput } from "$lib/components/atoms";
   import { TitledDiv } from "$lib/components/molecules";
-  import { ForceLoginModal } from "$lib/components/organisms";
   import { clientKeyStore, masterKeyStore } from "$lib/stores";
-  import {
+  import { requestLogin, requestSessionUpgrade, requestMasterKeyDownload } from "./service";
-    requestLogin,
-    requestClientRegistrationAndSessionUpgrade,
-    requestMasterKeyDownload,
-    requestDeletedFilesCleanup,
-    requestLogout,
-  } from "./service";
 
   let { data } = $props();
 
   let email = $state("");
   let password = $state("");
 
-  let isForceLoginModalOpen = $state(false);
-
   const redirect = async (url: string) => {
     return await goto(`${url}?redirect=${encodeURIComponent(data.redirectPath)}`);
   };
 
-  const upgradeSession = async (force: boolean) => {
-    try {
-      const [upgradeRes, upgradeError] = await requestClientRegistrationAndSessionUpgrade(
-        $clientKeyStore!,
-        force,
-      );
-      if (!force && upgradeError === "Already logged in") {
-        isForceLoginModalOpen = true;
-        return;
-      } else if (!upgradeRes) {
-        throw new Error("Failed to upgrade session");
-      }
-
-      // TODO: Multi-user support
-
-      if (
-        $masterKeyStore ||
-        (await requestMasterKeyDownload($clientKeyStore!.decryptKey, $clientKeyStore!.verifyKey))
-      ) {
-        await requestDeletedFilesCleanup();
-        await goto(data.redirectPath);
-      } else {
-        await redirect("/client/pending");
-      }
-    } catch (e) {
-      // TODO
-      throw e;
-    }
-  };
-
   const login = async () => {
     // TODO: Validation
 
@@ -61,7 +22,19 @@
 
       if (!$clientKeyStore) return await redirect("/key/generate");
 
-      await upgradeSession(false);
+      if (!(await requestSessionUpgrade($clientKeyStore)))
+        throw new Error("Failed to upgrade session");
+
+      // TODO: Multi-user support
+
+      if (
+        $masterKeyStore ||
+        (await requestMasterKeyDownload($clientKeyStore.decryptKey, $clientKeyStore.verifyKey))
+      ) {
+        await goto(data.redirectPath);
+      } else {
+        await redirect("/client/pending");
+      }
     } catch (e) {
       // TODO: Alert
       throw e;
@@ -90,9 +63,3 @@
     <TextButton>계정이 없어요</TextButton>
   </BottomDiv>
 </FullscreenDiv>
-
-<ForceLoginModal
-  bind:isOpen={isForceLoginModalOpen}
-  oncancel={requestLogout}
-  onLoginClick={() => upgradeSession(true)}
-/>

src/routes/(fullscreen)/auth/login/service.ts

@@ -1,14 +1,37 @@
 import { callPostApi } from "$lib/hooks";
+import { exportRSAKeyToBase64 } from "$lib/modules/crypto";
 import type { LoginRequest } from "$lib/server/schemas";
+import { requestSessionUpgrade as requestSessionUpgradeInternal } from "$lib/services/auth";
+import { requestClientRegistration } from "$lib/services/key";
+import type { ClientKeys } from "$lib/stores";
 
-export { requestLogout } from "$lib/services/auth";
+export { requestMasterKeyDownload } from "$lib/services/key";
-export { requestDeletedFilesCleanup } from "$lib/services/file";
-export {
-  requestClientRegistrationAndSessionUpgrade,
-  requestMasterKeyDownload,
-} from "$lib/services/key";
 
 export const requestLogin = async (email: string, password: string) => {
   const res = await callPostApi<LoginRequest>("/api/auth/login", { email, password });
   return res.ok;
 };
+
+export const requestSessionUpgrade = async ({
+  encryptKey,
+  decryptKey,
+  signKey,
+  verifyKey,
+}: ClientKeys) => {
+  const encryptKeyBase64 = await exportRSAKeyToBase64(encryptKey);
+  const verifyKeyBase64 = await exportRSAKeyToBase64(verifyKey);
+  if (await requestSessionUpgradeInternal(encryptKeyBase64, decryptKey, verifyKeyBase64, signKey)) {
+    return true;
+  }
+
+  if (await requestClientRegistration(encryptKeyBase64, decryptKey, verifyKeyBase64, signKey)) {
+    return await requestSessionUpgradeInternal(
+      encryptKeyBase64,
+      decryptKey,
+      verifyKeyBase64,
+      signKey,
+    );
+  } else {
+    return false;
+  }
+};

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

@@ -5,26 +5,28 @@
   import { goto } from "$app/navigation";
   import { FullscreenDiv } from "$lib/components/atoms";
   import { Categories, IconEntryButton, TopBar } from "$lib/components/molecules";
-  import { getCategoryInfo, type CategoryInfo } from "$lib/modules/filesystem2";
+  import {
-  import { getFileInfo } from "$lib/modules/filesystem2";
+    getFileInfo,
-  import { captureVideoThumbnail } from "$lib/modules/thumbnail";
+    getCategoryInfo,
+    type FileInfo,
+    type CategoryInfo,
+  } from "$lib/modules/filesystem";
   import { fileDownloadStatusStore, isFileDownloading, masterKeyStore } from "$lib/stores";
   import AddToCategoryBottomSheet from "./AddToCategoryBottomSheet.svelte";
   import DownloadStatus from "./DownloadStatus.svelte";
   import {
     requestFileRemovalFromCategory,
     requestFileDownload,
-    requestThumbnailUpload,
     requestFileAdditionToCategory,
   } from "./service";
 
-  import IconCamera from "~icons/material-symbols/camera";
   import IconClose from "~icons/material-symbols/close";
   import IconAddCircle from "~icons/material-symbols/add-circle";
 
   let { data } = $props();
 
-  let info = $derived(getFileInfo(data.id, $masterKeyStore?.get(1)?.key!));
+  let info: Writable<FileInfo | null> | undefined = $state();
+  let categories: Writable<CategoryInfo | null>[] = $state([]);
 
   let isAddToCategoryBottomSheetOpen = $state(false);
 
@@ -38,34 +40,19 @@
   let isDownloadRequested = $state(false);
   let viewerType: "image" | "video" | undefined = $state();
   let fileBlobUrl: string | undefined = $state();
-  let heicBlob: Blob | undefined = $state();
-  let videoElement: HTMLVideoElement | undefined = $state();
 
   const updateViewer = async (buffer: ArrayBuffer, contentType: string) => {
     const fileBlob = new Blob([buffer], { type: contentType });
-    if (viewerType) {
+    if (contentType === "image/heic") {
-      fileBlobUrl = URL.createObjectURL(fileBlob);
-      heicBlob = contentType === "image/heic" ? fileBlob : undefined;
-    }
-    return fileBlob;
-  };
-
-  const convertHeicToJpeg = async () => {
-    if (!heicBlob) return;
-
-    URL.revokeObjectURL(fileBlobUrl!);
-    fileBlobUrl = undefined;
-
       const { default: heic2any } = await import("heic2any");
       fileBlobUrl = URL.createObjectURL(
-      (await heic2any({ blob: heicBlob, toType: "image/jpeg" })) as Blob,
+        (await heic2any({ blob: fileBlob, toType: "image/jpeg" })) as Blob,
       );
-    heicBlob = undefined;
+    } else if (viewerType) {
-  };
+      fileBlobUrl = URL.createObjectURL(fileBlob);
+    }
 
-  const updateThumbnail = async (dataKey: CryptoKey, dataKeyVersion: Date) => {
+    return fileBlob;
-    const thumbnail = await captureVideoThumbnail(videoElement!);
-    await requestThumbnailUpload(data.id, thumbnail, dataKey, dataKeyVersion);
   };
 
   const addToCategory = async (categoryId: number) => {
@@ -80,14 +67,19 @@
   };
 
   $effect(() => {
-    data.id;
+    info = getFileInfo(data.id, $masterKeyStore?.get(1)?.key!);
     isDownloadRequested = false;
     viewerType = undefined;
   });
 
   $effect(() => {
-    if ($info.data?.dataKey && $info.data?.contentIv) {
+    categories =
-      const contentType = $info.data.contentType;
+      $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")) {
@@ -97,23 +89,21 @@
       untrack(() => {
         if (!downloadStatus && !isDownloadRequested) {
           isDownloadRequested = true;
-          requestFileDownload(data.id, $info.data.contentIv!, $info.data.dataKey!).then(
+          requestFileDownload(data.id, $info.contentIv!, $info.dataKey!).then(async (buffer) => {
-            async (buffer) => {
             const blob = await updateViewer(buffer, contentType);
             if (!viewerType) {
-                FileSaver.saveAs(blob, $info.data.name);
+              FileSaver.saveAs(blob, $info.name);
             }
-            },
+          });
-          );
         }
       });
     }
   });
 
   $effect(() => {
-    if ($info.status === "success" && $downloadStatus?.status === "decrypted") {
+    if ($info && $downloadStatus?.status === "decrypted") {
       untrack(
-        () => !isDownloadRequested && updateViewer($downloadStatus.result!, $info.data.contentType),
+        () => !isDownloadRequested && updateViewer($downloadStatus.result!, $info.contentType),
       );
     }
   });
@@ -125,11 +115,11 @@
   <title>파일</title>
 </svelte:head>
 
-<TopBar title={$info.data?.name} />
+<TopBar title={$info?.name} />
 <FullscreenDiv>
   <div class="space-y-4 pb-4">
     <DownloadStatus status={downloadStatus} />
-    {#if $info.status === "success" && viewerType}
+    {#if $info && viewerType}
       <div class="flex w-full justify-center">
         {#snippet viewerLoading(message: string)}
           <p class="text-gray-500">{message}</p>
@@ -137,23 +127,14 @@
 
         {#if viewerType === "image"}
           {#if fileBlobUrl}
-            <img src={fileBlobUrl} alt={$info.data.name} onerror={convertHeicToJpeg} />
+            <img src={fileBlobUrl} alt={$info.name} />
           {: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>
+            <video src={fileBlobUrl} controls></video>
-              <IconEntryButton
-                icon={IconCamera}
-                onclick={() => updateThumbnail($info.data.dataKey!, $info.data.dataKeyVersion!)}
-                class="w-full"
-              >
-                이 장면을 썸네일로 설정하기
-              </IconEntryButton>
-            </div>
           {:else}
             {@render viewerLoading("비디오를 불러오고 있어요.")}
           {/if}
@@ -164,7 +145,7 @@
       <p class="text-lg font-bold">카테고리</p>
       <div class="space-y-1">
         <Categories
-          categoryIds={$info.data?.categoryIds ?? []}
+          {categories}
           categoryMenuIcon={IconClose}
           onCategoryClick={({ id }) => goto(`/category/${id}`)}
           onCategoryMenuClick={({ id }) => removeFromCategory(id)}

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 CategoryInfoStore } from "$lib/modules/filesystem2";
+  import { getCategoryInfo, type CategoryInfo } from "$lib/modules/filesystem";
   import { masterKeyStore } from "$lib/stores";
   import { requestCategoryCreation } from "./service";
 
@@ -13,7 +14,7 @@
 
   let { onAddToCategoryClick, isOpen = $bindable() }: Props = $props();
 
-  let category: CategoryInfoStore | undefined = $state();
+  let category: Writable<CategoryInfo | null> | undefined = $state();
 
   let isCategoryCreateModalOpen = $state(false);
 
@@ -24,20 +25,20 @@
   });
 </script>
 
-{#if $category?.status === "success"}
+{#if $category}
   <BottomSheet bind:isOpen class="flex flex-col">
     <FullscreenDiv>
       <SubCategories
         class="py-4"
-        info={$category.data}
+        info={$category}
         onSubCategoryClick={({ id }) =>
           (category = getCategoryInfo(id, $masterKeyStore?.get(1)?.key!))}
         onSubCategoryCreateClick={() => (isCategoryCreateModalOpen = true)}
         subCategoryCreatePosition="top"
       />
-      {#if $category.data.id !== "root"}
+      {#if $category.id !== "root"}
         <BottomDiv>
-          <Button onclick={() => onAddToCategoryClick($category.data.id as number)} class="w-full">
+          <Button onclick={() => onAddToCategoryClick($category.id)} class="w-full">
             이 카테고리에 추가하기
           </Button>
         </BottomDiv>
@@ -49,8 +50,8 @@
 <CategoryCreateModal
   bind:isOpen={isCategoryCreateModalOpen}
   onCreateClick={async (name: string) => {
-    if (await requestCategoryCreation(name, $category!.data!.id, $masterKeyStore?.get(1)!)) {
+    if (await requestCategoryCreation(name, $category!.id, $masterKeyStore?.get(1)!)) {
-      category = getCategoryInfo($category!.data!.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
+      category = getCategoryInfo($category!.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
       return true;
     }
     return false;

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

@@ -1,25 +1,20 @@
 import { callPostApi } from "$lib/hooks";
-import { encryptData } from "$lib/modules/crypto";
+import { getFileCache, storeFileCache, downloadFile } from "$lib/modules/file";
-import { storeFileThumbnailCache } from "$lib/modules/file";
 import type { CategoryFileAddRequest } from "$lib/server/schemas";
-import { requestFileThumbnailUpload } from "$lib/services/file";
 
 export { requestCategoryCreation, requestFileRemovalFromCategory } from "$lib/services/category";
-export { requestFileDownload } from "$lib/services/file";
 
-export const requestThumbnailUpload = async (
+export const requestFileDownload = async (
   fileId: number,
-  thumbnail: Blob,
+  fileEncryptedIv: string,
   dataKey: CryptoKey,
-  dataKeyVersion: Date,
 ) => {
-  const thumbnailBuffer = await thumbnail.arrayBuffer();
+  const cache = await getFileCache(fileId);
-  const thumbnailEncrypted = await encryptData(thumbnailBuffer, dataKey);
+  if (cache) return cache;
-  const res = await requestFileThumbnailUpload(fileId, dataKeyVersion, thumbnailEncrypted);
-  if (!res.ok) return false;
 
-  storeFileThumbnailCache(fileId, thumbnailBuffer); // Intended
+  const fileBuffer = await downloadFile(fileId, fileEncryptedIv, dataKey);
-  return true;
+  storeFileCache(fileId, fileBuffer); // Intended
+  return fileBuffer;
 };
 
 export const requestFileAdditionToCategory = async (fileId: number, categoryId: number) => {

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

@@ -1,6 +1,6 @@
 <script lang="ts">
   import { get, type Writable } from "svelte/store";
-  import { getFileInfo } from "$lib/modules/filesystem2";
+  import { getFileInfo, type FileInfo } from "$lib/modules/filesystem";
   import { formatNetworkSpeed } from "$lib/modules/util";
   import { masterKeyStore, type FileDownloadStatus } from "$lib/stores";
 
@@ -17,10 +17,14 @@
 
   let { status }: Props = $props();
 
-  let fileInfo = $derived(getFileInfo(get(status).id, $masterKeyStore?.get(1)?.key!));
+  let fileInfo: Writable<FileInfo | null> | undefined = $state();
+
+  $effect(() => {
+    fileInfo = getFileInfo(get(status).id, $masterKeyStore?.get(1)?.key!);
+  });
 </script>
 
-{#if $fileInfo.status === "success"}
+{#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 $status.status === "download-pending"}
@@ -38,8 +42,8 @@
       {/if}
     </div>
     <div class="flex-grow overflow-hidden">
-      <p title={$fileInfo.data.name} class="truncate font-medium">
+      <p title={$fileInfo.name} class="truncate font-medium">
-        {$fileInfo.data.name}
+        {$fileInfo.name}
       </p>
       <p class="text-xs text-gray-800">
         {#if $status.status === "download-pending"}

src/routes/(fullscreen)/key/export/+page.svelte

@@ -3,12 +3,13 @@
   import { goto } from "$app/navigation";
   import { BottomDiv, Button, FullscreenDiv, TextButton } from "$lib/components/atoms";
   import { TitledDiv } from "$lib/components/molecules";
-  import { serializeClientKeys, storeClientKeys } from "$lib/modules/key";
   import { clientKeyStore } from "$lib/stores";
   import BeforeContinueBottomSheet from "./BeforeContinueBottomSheet.svelte";
   import BeforeContinueModal from "./BeforeContinueModal.svelte";
   import {
+    serializeClientKeys,
     requestClientRegistration,
+    storeClientKeys,
     requestSessionUpgrade,
     requestInitialMasterKeyAndHmacSecretRegistration,
   } from "./service";
@@ -21,8 +22,15 @@
   let isBeforeContinueBottomSheetOpen = $state(false);
 
   const exportClientKeys = () => {
-    const clientKeysSerialized = serializeClientKeys(data);
+    const clientKeysSerialized = serializeClientKeys(
-    const clientKeysBlob = new Blob([clientKeysSerialized], { type: "application/json" });
+      data.encryptKeyBase64,
+      data.decryptKeyBase64,
+      data.signKeyBase64,
+      data.verifyKeyBase64,
+    );
+    const clientKeysBlob = new Blob([JSON.stringify(clientKeysSerialized)], {
+      type: "application/json",
+    });
     FileSaver.saveAs(clientKeysBlob, "arkvault-clientkey.json");
 
     if (!isBeforeContinueBottomSheetOpen) {
@@ -51,14 +59,12 @@
       await storeClientKeys($clientKeyStore);
 
       if (
-        !(
+        !(await requestSessionUpgrade(
-          await requestSessionUpgrade(
           data.encryptKeyBase64,
           $clientKeyStore.decryptKey,
           data.verifyKeyBase64,
           $clientKeyStore.signKey,
-          )
+        ))
-        )[0]
       )
         throw new Error("Failed to upgrade session");
 

src/routes/(fullscreen)/key/export/service.ts

@@ -1,5 +1,68 @@
+import { callPostApi } from "$lib/hooks";
+import { storeClientKey } from "$lib/indexedDB";
+import { signMasterKeyWrapped } from "$lib/modules/crypto";
+import type {
+  InitialMasterKeyRegisterRequest,
+  InitialHmacSecretRegisterRequest,
+} from "$lib/server/schemas";
+import type { ClientKeys } from "$lib/stores";
+
 export { requestSessionUpgrade } from "$lib/services/auth";
-export {
+export { requestClientRegistration } from "$lib/services/key";
-  requestClientRegistration,
+
-  requestInitialMasterKeyAndHmacSecretRegistration,
+type SerializedKeyPairs = {
-} from "$lib/services/key";
+  generator: "ArkVault";
+  exportedAt: Date;
+} & {
+  version: 1;
+  encryptKey: string;
+  decryptKey: string;
+  signKey: string;
+  verifyKey: string;
+};
+
+export const serializeClientKeys = (
+  encryptKeyBase64: string,
+  decryptKeyBase64: string,
+  signKeyBase64: string,
+  verifyKeyBase64: string,
+) => {
+  return {
+    version: 1,
+    generator: "ArkVault",
+    exportedAt: new Date(),
+    encryptKey: encryptKeyBase64,
+    decryptKey: decryptKeyBase64,
+    signKey: signKeyBase64,
+    verifyKey: verifyKeyBase64,
+  } satisfies SerializedKeyPairs;
+};
+
+export const storeClientKeys = async (clientKeys: ClientKeys) => {
+  await Promise.all([
+    storeClientKey(clientKeys.encryptKey, "encrypt"),
+    storeClientKey(clientKeys.decryptKey, "decrypt"),
+    storeClientKey(clientKeys.signKey, "sign"),
+    storeClientKey(clientKeys.verifyKey, "verify"),
+  ]);
+};
+
+export const requestInitialMasterKeyAndHmacSecretRegistration = async (
+  masterKeyWrapped: string,
+  hmacSecretWrapped: string,
+  signKey: CryptoKey,
+) => {
+  let res = await callPostApi<InitialMasterKeyRegisterRequest>("/api/mek/register/initial", {
+    mek: masterKeyWrapped,
+    mekSig: await signMasterKeyWrapped(masterKeyWrapped, 1, signKey),
+  });
+  if (!res.ok) {
+    return res.status === 409;
+  }
+
+  res = await callPostApi<InitialHmacSecretRegisterRequest>("/api/hsk/register/initial", {
+    mekVersion: 1,
+    hsk: hmacSecretWrapped,
+  });
+  return res.ok;
+};

src/routes/(fullscreen)/key/generate/+page.svelte

@@ -3,29 +3,19 @@
   import { goto } from "$app/navigation";
   import { BottomDiv, Button, FullscreenDiv, TextButton } from "$lib/components/atoms";
   import { TitledDiv } from "$lib/components/molecules";
-  import { ForceLoginModal } from "$lib/components/organisms";
   import { gotoStateful } from "$lib/hooks";
-  import { storeClientKeys } from "$lib/modules/key";
   import { clientKeyStore } from "$lib/stores";
   import Order from "./Order.svelte";
   import {
     generateClientKeys,
     generateInitialMasterKey,
     generateInitialHmacSecret,
-    importClientKeys,
-    requestClientRegistrationAndSessionUpgrade,
-    requestInitialMasterKeyAndHmacSecretRegistration,
-    requestDeletedFilesCleanup,
   } from "./service";
 
   import IconKey from "~icons/material-symbols/key";
 
   let { data } = $props();
 
-  let fileInput: HTMLInputElement | undefined = $state();
-
-  let isForceLoginModalOpen = $state(false);
-
   // TODO: Update
   const orders = [
     {
@@ -61,54 +51,6 @@
     });
   };
 
-  const upgradeSession = async (force: boolean) => {
-    const [upgradeRes, upgradeError] = await requestClientRegistrationAndSessionUpgrade(
-      $clientKeyStore!,
-      force,
-    );
-    if (!force && upgradeError === "Already logged in") {
-      isForceLoginModalOpen = true;
-      return;
-    } else if (!upgradeRes) {
-      // TODO: Error Handling
-      return;
-    }
-
-    const { masterKey, masterKeyWrapped } = await generateInitialMasterKey(
-      $clientKeyStore!.encryptKey,
-    );
-    const { hmacSecretWrapped } = await generateInitialHmacSecret(masterKey);
-
-    await storeClientKeys($clientKeyStore!);
-
-    if (
-      !(await requestInitialMasterKeyAndHmacSecretRegistration(
-        masterKeyWrapped,
-        hmacSecretWrapped,
-        $clientKeyStore!.signKey,
-      ))
-    ) {
-      // TODO: Error Handling
-      return;
-    }
-
-    await requestDeletedFilesCleanup();
-    await goto("/client/pending?redirect=" + encodeURIComponent(data.redirectPath));
-  };
-
-  const importKeys = async () => {
-    const file = fileInput?.files?.[0];
-    if (!file) return;
-
-    if (await importClientKeys(await file.text())) {
-      await upgradeSession(false);
-    } else {
-      // TODO: Error Handling
-    }
-
-    fileInput!.value = "";
-  };
-
   onMount(async () => {
     if ($clientKeyStore) {
       await goto(data.redirectPath, { replaceState: true });
@@ -120,14 +62,6 @@
   <title>암호 키 생성하기</title>
 </svelte:head>
 
-<input
-  bind:this={fileInput}
-  onchange={importKeys}
-  type="file"
-  accept="application/json"
-  class="hidden"
-/>
-
 <FullscreenDiv>
   <TitledDiv childrenClass="space-y-4">
     {#snippet title()}
@@ -149,8 +83,6 @@
   </TitledDiv>
   <BottomDiv class="flex flex-col items-center gap-y-2">
     <Button onclick={generateKeys} class="w-full">새 암호 키 생성하기</Button>
-    <TextButton onclick={() => fileInput?.click()}>키를 갖고 있어요</TextButton>
+    <TextButton>키를 갖고 있어요</TextButton>
   </BottomDiv>
 </FullscreenDiv>
-
-<ForceLoginModal bind:isOpen={isForceLoginModalOpen} onLoginClick={() => upgradeSession(true)} />

src/routes/(fullscreen)/key/generate/service.ts

@@ -2,8 +2,6 @@ import {
   generateEncryptionKeyPair,
   generateSigningKeyPair,
   exportRSAKeyToBase64,
-  importEncryptionKeyPairFromBase64,
-  importSigningKeyPairFromBase64,
   makeRSAKeyNonextractable,
   wrapMasterKey,
   generateMasterKey,
@@ -11,16 +9,8 @@ import {
   wrapHmacSecret,
   generateHmacSecret,
 } from "$lib/modules/crypto";
-import { deserializeClientKeys } from "$lib/modules/key";
 import { clientKeyStore } from "$lib/stores";
 
-export { requestLogout } from "$lib/services/auth";
-export { requestDeletedFilesCleanup } from "$lib/services/file";
-export {
-  requestClientRegistrationAndSessionUpgrade,
-  requestInitialMasterKeyAndHmacSecretRegistration,
-} from "$lib/services/key";
-
 export const generateClientKeys = async () => {
   const { encryptKey, decryptKey } = await generateEncryptionKeyPair();
   const { signKey, verifyKey } = await generateSigningKeyPair();
@@ -55,25 +45,3 @@ export const generateInitialHmacSecret = async (masterKey: CryptoKey) => {
     hmacSecretWrapped: await wrapHmacSecret(hmacSecret, masterKey),
   };
 };
-
-export const importClientKeys = async (clientKeysSerialized: string) => {
-  const clientKeys = deserializeClientKeys(clientKeysSerialized);
-  if (!clientKeys) return false;
-
-  const { encryptKey, decryptKey } = await importEncryptionKeyPairFromBase64(
-    clientKeys.encryptKeyBase64,
-    clientKeys.decryptKeyBase64,
-  );
-  const { signKey, verifyKey } = await importSigningKeyPairFromBase64(
-    clientKeys.signKeyBase64,
-    clientKeys.verifyKeyBase64,
-  );
-
-  clientKeyStore.set({
-    encryptKey,
-    decryptKey: await makeRSAKeyNonextractable(decryptKey),
-    signKey: await makeRSAKeyNonextractable(signKey),
-    verifyKey,
-  });
-  return true;
-};

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

@@ -1,17 +1,19 @@
 <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 { getFileCacheIndex } from "$lib/modules/file";
-  import { getFileInfo, type FileInfoStore } from "$lib/modules/filesystem2";
+  import { getFileInfo, type FileInfo } from "$lib/modules/filesystem";
   import { formatFileSize } from "$lib/modules/util";
   import { masterKeyStore } from "$lib/stores";
   import File from "./File.svelte";
+  import { deleteFileCache as doDeleteFileCache } from "./service";
 
   interface FileCache {
     index: FileCacheIndex;
-    fileInfo: FileInfoStore;
+    fileInfo: Writable<FileInfo | null>;
   }
 
   let fileCache: FileCache[] | undefined = $state();

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 { FileInfoStore } from "$lib/modules/filesystem2";
+  import type { FileInfo } from "$lib/modules/filesystem";
   import { formatDate, formatFileSize } from "$lib/modules/util";
 
   import IconDraft from "~icons/material-symbols/draft";
@@ -9,7 +10,7 @@
 
   interface Props {
     index: FileCacheIndex;
-    info: FileInfoStore;
+    info: Writable<FileInfo | null>;
     onDeleteClick: (fileId: number) => void;
   }
 
@@ -27,8 +28,8 @@
     </div>
   {/if}
   <div class="flex-grow overflow-hidden">
-    {#if $info.status === "success"}
+    {#if $info}
-      <p title={$info.data.name} class="truncate font-medium">{$info.data.name}</p>
+      <p title={$info.name} class="truncate font-medium">{$info.name}</p>
     {:else}
       <p class="font-medium">삭제된 파일</p>
     {/if}

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

@@ -0,0 +1,5 @@
+import { deleteFileCache as doDeleteFileCache } from "$lib/modules/file";
+
+export const deleteFileCache = async (fileId: number) => {
+  await doDeleteFileCache(fileId);
+};

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

@@ -1,77 +0,0 @@
-<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 { getFileInfo } from "$lib/modules/filesystem2";
-  import { masterKeyStore } from "$lib/stores";
-  import File from "./File.svelte";
-  import {
-    persistentStates,
-    getGenerationStatus,
-    requestThumbnailGeneration,
-  } from "./service.svelte";
-
-  import IconDelete from "~icons/material-symbols/delete";
-
-  let { data } = $props();
-
-  const generateAllThumbnails = () => {
-    persistentStates.files.forEach(({ info }) => {
-      const fileInfo = get(info);
-      if (fileInfo.data) {
-        requestThumbnailGeneration(fileInfo.data);
-      }
-    });
-  };
-
-  onMount(() => {
-    persistentStates.files = data.files.map((fileId) => ({
-      id: fileId,
-      info: getFileInfo(fileId, $masterKeyStore?.get(1)?.key!),
-      status: getGenerationStatus(fileId),
-    }));
-  });
-</script>
-
-<svelte:head>
-  <title>썸네일 설정</title>
-</svelte:head>
-
-<TopBar title="썸네일" />
-<FullscreenDiv class="bg-gray-100 !px-0">
-  <div class="flex flex-grow flex-col space-y-4">
-    <div class="bg-white p-4 !pt-0">
-      <IconEntryButton icon={IconDelete} onclick={deleteAllFileThumbnailCaches} class="w-full">
-        저장된 썸네일 모두 삭제하기
-      </IconEntryButton>
-    </div>
-    {#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">
-            {persistentStates.files.length}개 파일의 썸네일이 존재하지 않아요.
-          </p>
-          <div class="space-y-2">
-            {#each persistentStates.files as { info, status }}
-              <File
-                {info}
-                generationStatus={status}
-                onclick={({ id }) => goto(`/file/${id}`)}
-                onGenerateThumbnailClick={requestThumbnailGeneration}
-              />
-            {/each}
-          </div>
-        </div>
-      </div>
-    {/if}
-  </div>
-  {#if persistentStates.files.length > 0}
-    <BottomDiv class="px-4">
-      <Button onclick={generateAllThumbnails} class="w-full">모두 썸네일 생성하기</Button>
-    </BottomDiv>
-  {/if}
-</FullscreenDiv>

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

@@ -1,14 +0,0 @@
-import { error } from "@sveltejs/kit";
-import { callPostApi } from "$lib/hooks";
-import type { MissingThumbnailFileScanResponse } from "$lib/server/schemas";
-import type { PageLoad } from "./$types";
-
-export const load: PageLoad = async ({ fetch }) => {
-  const res = await callPostApi("/api/file/scanMissingThumbnails", undefined, { fetch });
-  if (!res.ok) {
-    error(500, "Internal server error");
-  }
-
-  const { files }: MissingThumbnailFileScanResponse = await res.json();
-  return { files };
-};

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

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

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

@@ -1,158 +0,0 @@
-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, FileInfoStore } from "$lib/modules/filesystem2";
-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: FileInfoStore;
-  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()?.();
-  }
-};

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, useCategoryFileRecursionToggle } from "$lib/modules/filesystem2";
+  import { getCategoryInfo, type CategoryInfo } from "$lib/modules/filesystem";
   import { masterKeyStore } from "$lib/stores";
   import CategoryDeleteModal from "./CategoryDeleteModal.svelte";
   import CategoryMenuBottomSheet from "./CategoryMenuBottomSheet.svelte";
@@ -18,9 +19,9 @@
   let { data } = $props();
   let context = createContext();
 
-  let info = $derived(getCategoryInfo(data.id, $masterKeyStore?.get(1)?.key!));
+  let info: Writable<CategoryInfo | null> | undefined = $state();
-  let toggleFileRecursion = useCategoryFileRecursionToggle();
+
-  let isFileRecursive = $derived($info.data?.isFileRecursive);
+  let isFileRecursive = $state(false);
 
   let isCategoryCreateModalOpen = $state(false);
   let isCategoryMenuBottomSheetOpen = $state(false);
@@ -28,9 +29,7 @@
   let isCategoryDeleteModalOpen = $state(false);
 
   $effect(() => {
-    if (isFileRecursive !== undefined && $info.data?.isFileRecursive !== isFileRecursive) {
+    info = getCategoryInfo(data.id, $masterKeyStore?.get(1)?.key!);
-      $toggleFileRecursion.mutate({ id: data.id as number, isFileRecursive });
-    }
   });
 </script>
 
@@ -39,13 +38,13 @@
 </svelte:head>
 
 {#if data.id !== "root"}
-  <TopBar title={$info.data?.name} />
+  <TopBar title={$info?.name} />
 {/if}
 <div class="min-h-full bg-gray-100 pb-[5.5em]">
-  {#if $info.status === "success"}
+  {#if $info}
     <Category
       bind:isFileRecursive
-      info={$info.data}
+      info={$info}
       onFileClick={({ id }) => goto(`/file/${id}`)}
       onFileRemoveClick={async ({ id }) => {
         await requestFileRemovalFromCategory(id, data.id as number);

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

@@ -1,23 +1,10 @@
 <script lang="ts">
   import { onMount } from "svelte";
+  import type { Writable } from "svelte/store";
   import { goto } from "$app/navigation";
   import { FloatingButton } from "$lib/components/atoms";
   import { TopBar } from "$lib/components/molecules";
-  import {
+  import { getDirectoryInfo, type DirectoryInfo } from "$lib/modules/filesystem";
-    storeFileCache,
-    deleteFileCache,
-    storeFileThumbnailCache,
-    deleteFileThumbnailCache,
-  } from "$lib/modules/file";
-  import {
-    getDirectoryInfo,
-    useDirectoryCreation,
-    useDirectoryRename,
-    useDirectoryDeletion,
-    useFileUpload,
-    useFileRename,
-    useFileDeletion,
-  } from "$lib/modules/filesystem2";
   import { masterKeyStore, hmacSecretStore } from "$lib/stores";
   import DirectoryCreateModal from "./DirectoryCreateModal.svelte";
   import DirectoryEntries from "./DirectoryEntries";
@@ -28,23 +15,21 @@
   import EntryMenuBottomSheet from "./EntryMenuBottomSheet.svelte";
   import EntryRenameModal from "./EntryRenameModal.svelte";
   import UploadStatusCard from "./UploadStatusCard.svelte";
-  import { createContext, requestHmacSecretDownload } from "./service.svelte";
+  import {
+    createContext,
+    requestHmacSecretDownload,
+    requestDirectoryCreation,
+    requestFileUpload,
+    requestEntryRename,
+    requestEntryDeletion,
+  } from "./service.svelte";
 
   import IconAdd from "~icons/material-symbols/add";
 
   let { data } = $props();
   let context = createContext();
 
-  let info = $derived(getDirectoryInfo(data.id, $masterKeyStore?.get(1)?.key!));
+  let info: Writable<DirectoryInfo | null> | undefined = $state();
-  let requestDirectoryCreation = $derived(useDirectoryCreation(data.id, $masterKeyStore?.get(1)!));
-  let requestDirectoryRename = useDirectoryRename();
-  let requestDirectoryDeletion = $derived(useDirectoryDeletion(data.id));
-  let requestFileUpload = $derived(
-    useFileUpload(data.id, $masterKeyStore?.get(1)!, $hmacSecretStore?.get(1)!),
-  );
-  let requestFileRename = $derived(useFileRename());
-  let requestFileDeletion = $derived(useFileDeletion(data.id));
-
   let fileInput: HTMLInputElement | undefined = $state();
   let duplicatedFile: File | undefined = $state();
   let resolveForDuplicateFileModal: ((res: boolean) => void) | undefined = $state();
@@ -62,24 +47,21 @@
     if (!files || files.length === 0) return;
 
     for (const file of files) {
-      $requestFileUpload
+      requestFileUpload(file, data.id, $hmacSecretStore?.get(1)!, $masterKeyStore?.get(1)!, () => {
-        .mutateAsync({
-          file,
-          onDuplicate: () => {
         return new Promise((resolve) => {
           duplicatedFile = file;
           resolveForDuplicateFileModal = resolve;
           isDuplicateFileModalOpen = true;
         });
-          },
       })
         .then((res) => {
-          if (res) {
+          if (!res) return;
-            storeFileCache(res.fileId, res.fileBuffer); // Intended
+          // TODO: FIXME
-            if (res.thumbnailBuffer) {
+          info = getDirectoryInfo(data.id, $masterKeyStore?.get(1)?.key!);
-              storeFileThumbnailCache(res.fileId, res.thumbnailBuffer); // Intended
+        })
-            }
+        .catch((e: Error) => {
-          }
+          // TODO: FIXME
+          console.error(e);
         });
     }
 
@@ -91,6 +73,10 @@
       throw new Error("Failed to download hmac secrets");
     }
   });
+
+  $effect(() => {
+    info = getDirectoryInfo(data.id, $masterKeyStore?.get(1)?.key!);
+  });
 </script>
 
 <svelte:head>
@@ -101,17 +87,17 @@
 
 <div class="flex h-full flex-col">
   {#if data.id !== "root"}
-    <TopBar title={$info.data?.name} class="flex-shrink-0" />
+    <TopBar title={$info?.name} class="flex-shrink-0" />
   {/if}
-  {#if $info.status === "success"}
+  {#if $info}
     <div class={["flex flex-grow flex-col px-4 pb-4", data.id === "root" && "pt-4"]}>
       <div class="flex gap-x-2">
         <UploadStatusCard onclick={() => goto("/file/uploads")} />
         <DownloadStatusCard onclick={() => goto("/file/downloads")} />
       </div>
-      {#key $info.data.id}
+      {#key $info}
         <DirectoryEntries
-          info={$info.data}
+          info={$info}
           onEntryClick={({ type, id }) => goto(`/${type}/${id}`)}
           onEntryMenuClick={(entry) => {
             context.selectedEntry = entry;
@@ -144,8 +130,11 @@
 <DirectoryCreateModal
   bind:isOpen={isDirectoryCreateModalOpen}
   onCreateClick={async (name) => {
-    $requestDirectoryCreation.mutate({ name });
+    if (await requestDirectoryCreation(name, data.id, $masterKeyStore?.get(1)!)) {
-    return true; // TODO
+      info = getDirectoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
+      return true;
+    }
+    return false;
   }}
 />
 <DuplicateFileModal
@@ -175,45 +164,20 @@
 <EntryRenameModal
   bind:isOpen={isEntryRenameModalOpen}
   onRenameClick={async (newName: string) => {
-    if (context.selectedEntry!.type === "directory") {
+    if (await requestEntryRename(context.selectedEntry!, newName)) {
-      $requestDirectoryRename.mutate({
+      info = getDirectoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
-        id: context.selectedEntry!.id,
+      return true;
-        dataKey: context.selectedEntry!.dataKey,
-        dataKeyVersion: context.selectedEntry!.dataKeyVersion,
-        newName,
-      });
-      return true; // TODO
-    } else {
-      $requestFileRename.mutate({
-        id: context.selectedEntry!.id,
-        dataKey: context.selectedEntry!.dataKey,
-        dataKeyVersion: context.selectedEntry!.dataKeyVersion,
-        newName,
-      });
-      return true; // TODO
     }
+    return false;
   }}
 />
 <EntryDeleteModal
   bind:isOpen={isEntryDeleteModalOpen}
   onDeleteClick={async () => {
-    if (context.selectedEntry!.type === "directory") {
+    if (await requestEntryDeletion(context.selectedEntry!)) {
-      const res = await $requestDirectoryDeletion.mutateAsync({ id: context.selectedEntry!.id });
+      info = getDirectoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
-      if (!res) return false;
+      return true;
-      await Promise.all(
-        res.deletedFiles.flatMap((fileId) => [
-          deleteFileCache(fileId),
-          deleteFileThumbnailCache(fileId),
-        ]),
-      );
-      return true; // TODO
-    } else {
-      await $requestFileDeletion.mutateAsync({ id: context.selectedEntry!.id });
-      await Promise.all([
-        deleteFileCache(context.selectedEntry!.id),
-        deleteFileThumbnailCache(context.selectedEntry!.id),
-      ]);
-      return true; // TODO
     }
+    return false;
   }}
 />

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

@@ -1,12 +1,12 @@
 <script lang="ts">
-  import { derived } from "svelte/store";
+  import { untrack } from "svelte";
+  import { get, type Writable } from "svelte/store";
   import {
     getDirectoryInfo,
     getFileInfo,
     type DirectoryInfo,
-    type SubDirectoryInfo,
     type FileInfo,
-  } from "$lib/modules/filesystem2";
+  } from "$lib/modules/filesystem";
   import { SortBy, sortEntries } from "$lib/modules/util";
   import {
     fileUploadStatusStore,
@@ -30,84 +30,88 @@
 
   interface DirectoryEntry {
     name?: string;
-    info: SubDirectoryInfo;
+    info: Writable<DirectoryInfo | null>;
   }
 
   type FileEntry =
     | {
         type: "file";
         name?: string;
-        info: FileInfo;
+        info: Writable<FileInfo | null>;
       }
     | {
         type: "uploading-file";
         name: string;
-        info: FileUploadStatus;
+        info: Writable<FileUploadStatus>;
       };
 
-  let subDirectories = $derived(
+  let subDirectories: DirectoryEntry[] = $state([]);
-    derived(
+  let files: FileEntry[] = $state([]);
-      info.subDirectoryIds.map((id) => getDirectoryInfo(id, $masterKeyStore?.get(1)?.key!)),
+
-      (infos) => {
+  $effect(() => {
-        const subDirectories = infos
+    // TODO: Fix duplicated requests
-          .filter(($info) => $info.status === "success")
+
-          .map(
+    subDirectories = info.subDirectoryIds.map((id) => {
-            ($info) =>
+      const info = getDirectoryInfo(id, $masterKeyStore?.get(1)?.key!);
-              ({
+      return { name: get(info)?.name, info };
-                name: $info.data.name,
+    });
-                info: $info.data as SubDirectoryInfo,
+    files = info.fileIds
-              }) satisfies DirectoryEntry,
+      .map((id): FileEntry => {
-          );
+        const info = getFileInfo(id, $masterKeyStore?.get(1)?.key!);
-        sortEntries(subDirectories, sortBy);
+        return {
-        return subDirectories;
-      },
-    ),
-  );
-  let files = $derived(
-    derived(
-      info.fileIds.map((id) => getFileInfo(id, $masterKeyStore?.get(1)?.key!)),
-      (infos) =>
-        infos
-          .filter(($info) => $info.status === "success")
-          .map(
-            ($info) =>
-              ({
           type: "file",
-                name: $info.data.name,
+          name: get(info)?.name,
-                info: $info.data,
+          info,
-              }) satisfies FileEntry,
+        };
-          ),
+      })
-    ),
+      .concat(
-  );
+        $fileUploadStatusStore
-  let uploadingFiles = $derived(
+          .filter((statusStore) => {
-    derived($fileUploadStatusStore, (statuses) =>
+            const { parentId, status } = get(statusStore);
-      statuses
+            return parentId === info.id && isFileUploading(status);
-        .filter(({ parentId, status }) => parentId === info.id && isFileUploading(status))
+          })
-        .map(
+          .map((status) => ({
-          ($status) =>
-            ({
             type: "uploading-file",
-              name: $status.name,
+            name: get(status).name,
-              info: $status,
+            info: status,
-            }) satisfies FileEntry,
+          })),
-        ),
-    ),
       );
-  let everyFiles = $derived(
+
-    derived([files, uploadingFiles], ([$files, $uploadingFiles]) => {
+    const sort = () => {
-      const allFiles = [...$files, ...$uploadingFiles];
+      sortEntries(subDirectories, sortBy);
-      sortEntries(allFiles, sortBy);
+      sortEntries(files, sortBy);
-      return allFiles;
+    };
+    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 $subDirectories.length + $everyFiles.length > 0}
+{#if subDirectories.length + files.length > 0}
   <div class="space-y-1 pb-[4.5rem]">
-    {#each $subDirectories as { info }}
+    {#each subDirectories as { info }}
       <SubDirectory {info} onclick={onEntryClick} onOpenMenuClick={onEntryMenuClick} />
     {/each}
-    {#each $everyFiles as file}
+    {#each files as file}
       {#if file.type === "file"}
         <File info={file.info} onclick={onEntryClick} onOpenMenuClick={onEntryMenuClick} />
       {:else}

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

@@ -1,53 +1,37 @@
 <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/filesystem2";
+  import type { FileInfo } from "$lib/modules/filesystem";
   import { formatDateTime } from "$lib/modules/util";
-  import { requestFileThumbnailDownload } from "./service";
   import type { SelectedEntry } from "../service.svelte";
 
   import IconMoreVert from "~icons/material-symbols/more-vert";
 
   interface Props {
-    info: FileInfo;
+    info: Writable<FileInfo | null>;
     onclick: (selectedEntry: SelectedEntry) => void;
     onOpenMenuClick: (selectedEntry: SelectedEntry) => void;
   }
 
   let { info, onclick, onOpenMenuClick }: Props = $props();
 
-  let thumbnail: string | undefined = $state();
-
   const openFile = () => {
-    const { id, dataKey, dataKeyVersion, name } = info;
+    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;
+    const { id, dataKey, dataKeyVersion, name } = $info!;
     if (!dataKey || !dataKeyVersion) return; // TODO: Error handling
 
     onOpenMenuClick({ type: "file", id, dataKey, dataKeyVersion, name });
   };
-
-  $effect(() => {
-    if (info.dataKey) {
-      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={openFile}
@@ -56,8 +40,8 @@
   >
     <DirectoryEntryLabel
       type="file"
-    {thumbnail}
+      name={$info.name}
-    name={info.name}
+      subtext={formatDateTime($info.createdAt ?? $info.lastModifiedAt)}
-    subtext={formatDateTime(info.createdAt ?? info.lastModifiedAt)}
     />
   </ActionEntryButton>
+{/if}

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

@@ -1,13 +1,16 @@
 <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/filesystem2";
+  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;
+    info: Writable<DirectoryInfo | null>;
     onclick: (selectedEntry: SelectedEntry) => void;
     onOpenMenuClick: (selectedEntry: SelectedEntry) => void;
   }
@@ -15,25 +18,27 @@
   let { info, onclick, onOpenMenuClick }: Props = $props();
 
   const openDirectory = () => {
-    const { id, dataKey, dataKeyVersion, name } = info;
+    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;
+    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={openDirectory}
     actionButtonIcon={IconMoreVert}
     onActionButtonClick={openMenu}
   >
-  <DirectoryEntryLabel type="directory" name={info.name} />
+    <DirectoryEntryLabel type="directory" name={$info.name!} />
   </ActionEntryButton>
+{/if}

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

@@ -1,35 +1,36 @@
 <script lang="ts">
+  import type { Writable } from "svelte/store";
   import { formatNetworkSpeed } from "$lib/modules/util";
   import { isFileUploading, type FileUploadStatus } from "$lib/stores";
 
   import IconDraft from "~icons/material-symbols/draft";
 
   interface Props {
-    status: FileUploadStatus;
+    status: Writable<FileUploadStatus>;
   }
 
   let { status }: Props = $props();
 </script>
 
-{#if isFileUploading(status.status)}
+{#if isFileUploading($status.status)}
-  <div class="flex h-14 gap-x-4 p-2">
+  <div class="flex h-14 items-center gap-x-4 p-2">
-    <div class="flex h-10 w-10 flex-shrink-0 items-center justify-center text-xl">
+    <div class="flex-shrink-0 text-lg">
       <IconDraft class="text-gray-600" />
     </div>
     <div class="flex flex-grow flex-col overflow-hidden text-gray-800">
-      <p title={status.name} class="truncate font-medium">
+      <p title={$status.name} class="truncate font-medium">
-        {status.name}
+        {$status.name}
       </p>
       <p class="text-xs">
-        {#if status.status === "encryption-pending"}
+        {#if $status.status === "encryption-pending"}
           준비 중
-        {:else if status.status === "encrypting"}
+        {:else if $status.status === "encrypting"}
           암호화하는 중
-        {:else if status.status === "upload-pending"}
+        {:else if $status.status === "upload-pending"}
           업로드를 기다리는 중
-        {:else if status.status === "uploading"}
+        {:else if $status.status === "uploading"}
-          전송됨 {Math.floor((status.progress ?? 0) * 100)}% ·
+          전송됨 {Math.floor(($status.progress ?? 0) * 100)}% ·
-          {formatNetworkSpeed((status.rate ?? 0) * 8)}
+          {formatNetworkSpeed(($status.rate ?? 0) * 8)}
         {/if}
       </p>
     </div>

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

@@ -1 +0,0 @@
-export { requestFileThumbnailDownload } from "$lib/services/file";

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

@@ -2,13 +2,7 @@ import { getContext, setContext } from "svelte";
 import { callGetApi, callPostApi } from "$lib/hooks";
 import { storeHmacSecrets } from "$lib/indexedDB";
 import { generateDataKey, wrapDataKey, unwrapHmacSecret, encryptString } from "$lib/modules/crypto";
-import {
+import { storeFileCache, deleteFileCache, uploadFile } from "$lib/modules/file";
-  storeFileCache,
-  deleteFileCache,
-  storeFileThumbnailCache,
-  deleteFileThumbnailCache,
-  uploadFile,
-} from "$lib/modules/file";
 import type {
   DirectoryRenameRequest,
   DirectoryCreateRequest,
@@ -87,10 +81,6 @@ export const requestFileUpload = async (
   if (!res) return false;
 
   storeFileCache(res.fileId, res.fileBuffer); // Intended
-  if (res.thumbnailBuffer) {
-    storeFileThumbnailCache(res.fileId, res.thumbnailBuffer); // Intended
-  }
-
   return true;
 };
 
@@ -120,12 +110,10 @@ export const requestEntryDeletion = async (entry: SelectedEntry) => {
 
   if (entry.type === "directory") {
     const { deletedFiles }: DirectoryDeleteResponse = await res.json();
-    await Promise.all(
+    await Promise.all(deletedFiles.map(deleteFileCache));
-      deletedFiles.flatMap((fileId) => [deleteFileCache(fileId), deleteFileThumbnailCache(fileId)]),
-    );
     return true;
   } else {
-    await Promise.all([deleteFileCache(entry.id), deleteFileThumbnailCache(entry.id)]);
+    await deleteFileCache(entry.id);
     return true;
   }
 };

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

@@ -4,7 +4,6 @@
   import { requestLogout } from "./service";
 
   import IconStorage from "~icons/material-symbols/storage";
-  import IconImage from "~icons/material-symbols/image";
   import IconPassword from "~icons/material-symbols/password";
   import IconLogout from "~icons/material-symbols/logout";
 
@@ -34,13 +33,6 @@
     >
       캐시
     </MenuEntryButton>
-    <MenuEntryButton
-      onclick={() => goto("/settings/thumbnail")}
-      icon={IconImage}
-      iconColor="text-blue-500"
-    >
-      썸네일
-    </MenuEntryButton>
   </div>
   <div class="space-y-2">
     <p class="font-semibold">보안</p>

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

@@ -4,7 +4,7 @@ import type { UserInfoResponse } from "$lib/server/schemas";
 import type { PageLoad } from "./$types";
 
 export const load: PageLoad = async ({ fetch }) => {
-  const res = await callGetApi("/api/user", { fetch });
+  const res = await callGetApi("/api/user", fetch);
   if (!res.ok) {
     error(500, "Internal server error");
   }

src/routes/(main)/menu/service.ts

@@ -1 +1,6 @@
-export { requestLogout } from "$lib/services/auth";
+import { callPostApi } from "$lib/hooks";
+
+export const requestLogout = async () => {
+  const res = await callPostApi("/api/auth/logout");
+  return res.ok;
+};

src/routes/+layout.svelte

@@ -1,8 +1,6 @@
 <script lang="ts">
-  import { QueryClient, QueryClientProvider } from "@tanstack/svelte-query";
   import { onMount } from "svelte";
   import { get } from "svelte/store";
-  import { browser } from "$app/environment";
   import { goto as svelteGoto } from "$app/navigation";
   import {
     fileUploadStatusStore,
@@ -12,19 +10,10 @@
     clientKeyStore,
     masterKeyStore,
   } from "$lib/stores";
-
   import "../app.css";
 
   let { children } = $props();
 
-  const queryClient = new QueryClient({
-    defaultOptions: {
-      queries: {
-        enabled: browser,
-      },
-    },
-  });
-
   const protectFileUploadAndDownload = (e: BeforeUnloadEvent) => {
     if (
       $fileUploadStatusStore.some((status) => isFileUploading(get(status).status)) ||
@@ -35,8 +24,6 @@
   };
 
   onMount(async () => {
-    window.__TANSTACK_QUERY_CLIENT__ = queryClient;
-
     const goto = async (url: string) => {
       const whitelist = ["/auth/login", "/key", "/client/pending"];
       if (!whitelist.some((path) => location.pathname.startsWith(path))) {
@@ -56,6 +43,4 @@
 
 <svelte:window onbeforeunload={protectFileUploadAndDownload} />
 
-<QueryClientProvider client={queryClient}>
 {@render children()}
-</QueryClientProvider>

src/routes/api/auth/upgradeSession/+server.ts

@@ -15,12 +15,12 @@ export const POST: RequestHandler = async ({ locals, request }) => {
   if (!zodRes.success) error(400, "Invalid request body");
   const { encPubKey, sigPubKey } = zodRes.data;
 
-  const { id, challenge } = await createSessionUpgradeChallenge(
+  const { challenge } = await createSessionUpgradeChallenge(
     sessionId,
     userId,
     locals.ip,
     encPubKey,
     sigPubKey,
   );
-  return json(sessionUpgradeResponse.parse({ id, challenge } satisfies SessionUpgradeResponse));
+  return json(sessionUpgradeResponse.parse({ challenge } satisfies SessionUpgradeResponse));
 };

src/routes/api/auth/upgradeSession/verify/+server.ts

@@ -5,12 +5,12 @@ import { verifySessionUpgradeChallenge } from "$lib/server/services/auth";
 import type { RequestHandler } from "./$types";
 
 export const POST: RequestHandler = async ({ locals, request }) => {
-  const { sessionId, userId } = await authorize(locals, "notClient");
+  const { sessionId } = await authorize(locals, "notClient");
 
   const zodRes = sessionUpgradeVerifyRequest.safeParse(await request.json());
   if (!zodRes.success) error(400, "Invalid request body");
-  const { id, answerSig, force } = zodRes.data;
+  const { answer, answerSig } = zodRes.data;
 
-  await verifySessionUpgradeChallenge(sessionId, userId, locals.ip, id, answerSig, force);
+  await verifySessionUpgradeChallenge(sessionId, locals.ip, answer, answerSig);
   return text("Session upgraded", { headers: { "Content-Type": "text/plain" } });
 };

src/routes/api/category/create/+server.ts

@@ -1,10 +1,6 @@
-import { error, json } from "@sveltejs/kit";
+import { error, text } from "@sveltejs/kit";
 import { authorize } from "$lib/server/modules/auth";
-import {
+import { categoryCreateRequest } from "$lib/server/schemas";
-  categoryCreateRequest,
-  categoryCreateResponse,
-  type CategoryCreateResponse,
-} from "$lib/server/schemas";
 import { createCategory } from "$lib/server/services/category";
 import type { RequestHandler } from "./$types";
 
@@ -15,7 +11,7 @@ export const POST: RequestHandler = async ({ locals, request }) => {
   if (!zodRes.success) error(400, "Invalid request body");
   const { parent, mekVersion, dek, dekVersion, name, nameIv } = zodRes.data;
 
-  const { id } = await createCategory({
+  await createCategory({
     userId,
     parentId: parent,
     mekVersion,
@@ -23,5 +19,5 @@ export const POST: RequestHandler = async ({ locals, request }) => {
     dekVersion: new Date(dekVersion),
     encName: { ciphertext: name, iv: nameIv },
   });
-  return json(categoryCreateResponse.parse({ category: id } satisfies CategoryCreateResponse));
+  return text("Category created", { headers: { "Content-Type": "text/plain" } });
 };

src/routes/api/client/register/+server.ts

@@ -15,6 +15,6 @@ export const POST: RequestHandler = async ({ locals, request }) => {
   if (!zodRes.success) error(400, "Invalid request body");
   const { encPubKey, sigPubKey } = zodRes.data;
 
-  const { id, challenge } = await registerUserClient(userId, locals.ip, encPubKey, sigPubKey);
+  const { challenge } = await registerUserClient(userId, locals.ip, encPubKey, sigPubKey);
-  return json(clientRegisterResponse.parse({ id, challenge } satisfies ClientRegisterResponse));
+  return json(clientRegisterResponse.parse({ challenge } satisfies ClientRegisterResponse));
 };

src/routes/api/client/register/verify/+server.ts

@@ -9,8 +9,8 @@ export const POST: RequestHandler = async ({ locals, request }) => {
 
   const zodRes = clientRegisterVerifyRequest.safeParse(await request.json());
   if (!zodRes.success) error(400, "Invalid request body");
-  const { id, answerSig } = zodRes.data;
+  const { answer, answerSig } = zodRes.data;
 
-  await verifyUserClient(userId, locals.ip, id, answerSig);
+  await verifyUserClient(userId, locals.ip, answer, answerSig);
   return text("Client verified", { headers: { "Content-Type": "text/plain" } });
 };

src/routes/api/directory/[id]/delete/+server.ts

@@ -16,11 +16,8 @@ export const POST: RequestHandler = async ({ locals, params }) => {
   if (!zodRes.success) error(400, "Invalid path parameters");
   const { id } = zodRes.data;
 
-  const { directories, files } = await deleteDirectory(userId, id);
+  const { files } = await deleteDirectory(userId, id);
   return json(
-    directoryDeleteResponse.parse({
+    directoryDeleteResponse.parse({ deletedFiles: files } satisfies DirectoryDeleteResponse),
-      deletedDirectories: directories,
-      deletedFiles: files,
-    } satisfies DirectoryDeleteResponse),
   );
 };

src/routes/api/directory/create/+server.ts

@@ -1,10 +1,6 @@
-import { error, json } from "@sveltejs/kit";
+import { error, text } from "@sveltejs/kit";
 import { authorize } from "$lib/server/modules/auth";
-import {
+import { directoryCreateRequest } from "$lib/server/schemas";
-  directoryCreateRequest,
-  directoryCreateResponse,
-  type DirectoryCreateResponse,
-} from "$lib/server/schemas";
 import { createDirectory } from "$lib/server/services/directory";
 import type { RequestHandler } from "./$types";
 
@@ -15,7 +11,7 @@ export const POST: RequestHandler = async ({ locals, request }) => {
   if (!zodRes.success) error(400, "Invalid request body");
   const { parent, mekVersion, dek, dekVersion, name, nameIv } = zodRes.data;
 
-  const { id } = await createDirectory({
+  await createDirectory({
     userId,
     parentId: parent,
     mekVersion,
@@ -23,5 +19,5 @@ export const POST: RequestHandler = async ({ locals, request }) => {
     dekVersion: new Date(dekVersion),
     encName: { ciphertext: name, iv: nameIv },
   });
-  return json(directoryCreateResponse.parse({ directory: id } satisfies DirectoryCreateResponse));
+  return text("Directory created", { headers: { "Content-Type": "text/plain" } });
 };

src/routes/api/file/[id]/thumbnail/+server.ts

@@ -1,26 +0,0 @@
-import { error, json } from "@sveltejs/kit";
-import { z } from "zod";
-import { authorize } from "$lib/server/modules/auth";
-import { fileThumbnailInfoResponse, type FileThumbnailInfoResponse } from "$lib/server/schemas";
-import { getFileThumbnailInformation } from "$lib/server/services/file";
-import type { RequestHandler } from "./$types";
-
-export const GET: RequestHandler = async ({ locals, params }) => {
-  const { userId } = await authorize(locals, "activeClient");
-
-  const zodRes = z
-    .object({
-      id: z.coerce.number().int().positive(),
-    })
-    .safeParse(params);
-  if (!zodRes.success) error(400, "Invalid path parameters");
-  const { id } = zodRes.data;
-
-  const { updatedAt, encContentIv } = await getFileThumbnailInformation(userId, id);
-  return json(
-    fileThumbnailInfoResponse.parse({
-      updatedAt: updatedAt.toISOString(),
-      contentIv: encContentIv,
-    } satisfies FileThumbnailInfoResponse),
-  );
-};