카테고리 페이지에서의 네트워크 호출 최적화

2026-02-04 16:16:55 +00:00 · 2025-12-30 20:53:20 +09:00
parent 1e57941f4c
commit b5522a4c6d
19 changed files with 416 additions and 521 deletions
--- a/src/routes/(main)/category/[[id]]/+page.svelte
+++ b/src/routes/(main)/category/[[id]]/+page.svelte
@@ -1,9 +1,8 @@
 <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, updateCategoryInfo, type CategoryInfo } from "$lib/modules/filesystem";
+  import { getCategoryInfo, type CategoryInfo } from "$lib/modules/filesystem2.svelte";
  import { masterKeyStore } from "$lib/stores";
  import CategoryDeleteModal from "./CategoryDeleteModal.svelte";
  import CategoryMenuBottomSheet from "./CategoryMenuBottomSheet.svelte";
@@ -19,9 +18,7 @@
  let { data } = $props();
  let context = createContext();

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

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

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

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

-{#if data.id !== "root"}
-  <TopBar title={$info?.name} />
-{/if}
-<div class="min-h-full bg-gray-100 pb-[5.5em]">
-  {#if $info && isFileRecursive !== undefined}
-    <Category
-      bind:isFileRecursive
-      info={$info}
-      onFileClick={({ id }) => goto(`/file/${id}?from=category`)}
-      onFileRemoveClick={async ({ id }) => {
-        await requestFileRemovalFromCategory(id, data.id as number);
-        info = getCategoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
+{#await infoPromise then info}
+  {#if info}
+    {#if info.id !== "root"}
+      <TopBar title={info.name} />
+    {/if}
+    <div class="min-h-full bg-gray-100 pb-[5.5em]">
+      <Category
+        bind:isFileRecursive={info.isFileRecursive}
+        {info}
+        onFileClick={({ id }) => goto(`/file/${id}?from=category`)}
+        onFileRemoveClick={async ({ id }) => {
+          await requestFileRemovalFromCategory(id, data.id as number);
+          infoPromise = getCategoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
+        }}
+        onSubCategoryClick={({ id }) => goto(`/category/${id}`)}
+        onSubCategoryCreateClick={() => (isCategoryCreateModalOpen = true)}
+        onSubCategoryMenuClick={(subCategory) => {
+          context.selectedCategory = subCategory;
+          isCategoryMenuBottomSheetOpen = true;
+        }}
+      />
+    </div>
+
+    <CategoryCreateModal
+      bind:isOpen={isCategoryCreateModalOpen}
+      onCreateClick={async (name: string) => {
+        if (await requestCategoryCreation(name, data.id, $masterKeyStore?.get(1)!)) {
+          infoPromise = getCategoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
+          return true;
+        }
+        return false;
      }}
-      onSubCategoryClick={({ id }) => goto(`/category/${id}`)}
-      onSubCategoryCreateClick={() => (isCategoryCreateModalOpen = true)}
-      onSubCategoryMenuClick={(subCategory) => {
-        context.selectedCategory = subCategory;
-        isCategoryMenuBottomSheetOpen = true;
+    />
+
+    <CategoryMenuBottomSheet
+      bind:isOpen={isCategoryMenuBottomSheetOpen}
+      onRenameClick={() => {
+        isCategoryMenuBottomSheetOpen = false;
+        isCategoryRenameModalOpen = true;
+      }}
+      onDeleteClick={() => {
+        isCategoryMenuBottomSheetOpen = false;
+        isCategoryDeleteModalOpen = true;
+      }}
+    />
+    <CategoryRenameModal
+      bind:isOpen={isCategoryRenameModalOpen}
+      onRenameClick={async (newName: string) => {
+        if (await requestCategoryRename(context.selectedCategory!, newName)) {
+          infoPromise = getCategoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
+          return true;
+        }
+        return false;
+      }}
+    />
+    <CategoryDeleteModal
+      bind:isOpen={isCategoryDeleteModalOpen}
+      onDeleteClick={async () => {
+        if (await requestCategoryDeletion(context.selectedCategory!)) {
+          infoPromise = getCategoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
+          return true;
+        }
+        return false;
      }}
    />
  {/if}
-</div>
-
-<CategoryCreateModal
-  bind:isOpen={isCategoryCreateModalOpen}
-  onCreateClick={async (name: string) => {
-    if (await requestCategoryCreation(name, data.id, $masterKeyStore?.get(1)!)) {
-      info = getCategoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
-      return true;
-    }
-    return false;
-  }}
-/>
-
-<CategoryMenuBottomSheet
-  bind:isOpen={isCategoryMenuBottomSheetOpen}
-  onRenameClick={() => {
-    isCategoryMenuBottomSheetOpen = false;
-    isCategoryRenameModalOpen = true;
-  }}
-  onDeleteClick={() => {
-    isCategoryMenuBottomSheetOpen = false;
-    isCategoryDeleteModalOpen = true;
-  }}
-/>
-<CategoryRenameModal
-  bind:isOpen={isCategoryRenameModalOpen}
-  onRenameClick={async (newName: string) => {
-    if (await requestCategoryRename(context.selectedCategory!, newName)) {
-      info = getCategoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
-      return true;
-    }
-    return false;
-  }}
-/>
-<CategoryDeleteModal
-  bind:isOpen={isCategoryDeleteModalOpen}
-  onDeleteClick={async () => {
-    if (await requestCategoryDeletion(context.selectedCategory!)) {
-      info = getCategoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
-      return true;
-    }
-    return false;
-  }}
-/>
+{/await}
--- a/src/routes/(main)/category/[[id]]/service.svelte.ts
+++ b/src/routes/(main)/category/[[id]]/service.svelte.ts
@@ -17,12 +17,17 @@ export const useContext = () => {
 };

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

  try {
    await trpc().category.rename.mutate({
      id: category.id,
-      dekVersion: category.dataKeyVersion,
+      dekVersion: category.dataKey.version,
      name: newNameEncrypted.ciphertext,
      nameIv: newNameEncrypted.iv,
    });