+
{#snippet viewerLoading(message: string)}
{/snippet}
- {#if $info && contentType === "image"}
- {#if contentUrl}
- 
+ {#if $info && viewerType === "image"}
+ {#if fileBlobUrl}
+ 
{:else}
{@render viewerLoading("이미지를 불러오고 있어요.")}
{/if}
- {:else if contentType === "video"}
- {#if contentUrl}
+ {:else if viewerType === "video"}
+ {#if fileBlobUrl}
-
+
{:else}
{@render viewerLoading("비디오를 불러오고 있어요.")}
{/if}
diff --git a/src/routes/(fullscreen)/file/[id]/+page.ts b/src/routes/(fullscreen)/file/[id]/+page.ts
index 45c696e..0521107 100644
--- a/src/routes/(fullscreen)/file/[id]/+page.ts
+++ b/src/routes/(fullscreen)/file/[id]/+page.ts
@@ -2,8 +2,6 @@ import { error } from "@sveltejs/kit";
import { z } from "zod";
import type { PageLoad } from "./$types";
-export const ssr = false; // Because of heic2any
-
export const load: PageLoad = async ({ params }) => {
const zodRes = z
.object({
diff --git a/src/routes/(fullscreen)/file/[id]/DownloadStatus.svelte b/src/routes/(fullscreen)/file/[id]/DownloadStatus.svelte
new file mode 100644
index 0000000..21774cd
--- /dev/null
+++ b/src/routes/(fullscreen)/file/[id]/DownloadStatus.svelte
@@ -0,0 +1,33 @@
+
+
+{#if $status && isFileDownloading($status.status)}
+ ((resolve, reject) => {
- const xhr = new XMLHttpRequest();
- xhr.responseType = "arraybuffer";
+ const cache = await getFileCache(fileId);
+ if (cache) return cache;
- xhr.addEventListener("load", async () => {
- if (xhr.status !== 200) {
- reject(new Error("Failed to download file"));
- return;
- }
-
- const fileDecrypted = await decryptData(
- xhr.response as ArrayBuffer,
- fileEncryptedIv,
- dataKey,
- );
- resolve(fileDecrypted);
- });
-
- // TODO: Progress, ...
-
- xhr.open("GET", `/api/file/${fileId}/download`);
- xhr.send();
- });
+ const fileBuffer = await downloadFile(fileId, fileEncryptedIv, dataKey);
+ storeFileCache(fileId, fileBuffer); // Intended
+ return fileBuffer;
};
diff --git a/src/routes/(fullscreen)/file/downloads/+page.svelte b/src/routes/(fullscreen)/file/downloads/+page.svelte
new file mode 100644
index 0000000..a3ce387
--- /dev/null
+++ b/src/routes/(fullscreen)/file/downloads/+page.svelte
@@ -0,0 +1,29 @@
+
+
+
+ 진행 중인 다운로드
+
+
+
+ 진행 중인 업로드
+
+
+
+ 캐시 설정
+
+
+ | undefined = $state();
let fileInput: HTMLInputElement | undefined = $state();
- let loadedFile: LoadedFile | undefined = $state();
+ let resolveForDuplicateFileModal: ((res: boolean) => void) | undefined = $state();
+ let duplicatedFile: File | undefined = $state();
let selectedEntry: SelectedDirectoryEntry | undefined = $state();
let isCreateBottomSheetOpen = $state(false);
@@ -52,34 +48,33 @@
info = getDirectoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
};
- const uploadFile = (loadedFile: LoadedFile) => {
- requestFileUpload(
- loadedFile.file,
- loadedFile.fileBuffer,
- loadedFile.fileSigned,
- data.id,
- $masterKeyStore?.get(1)!,
- $hmacSecretStore?.get(1)!,
- ).then(() => {
- info = getDirectoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
- });
- };
+ const uploadFile = () => {
+ const files = fileInput?.files;
+ if (!files || files.length === 0) return;
- const loadAndUploadFile = async () => {
- const file = fileInput?.files?.[0];
- if (!file) return;
+ for (const file of files) {
+ requestFileUpload(file, data.id, $hmacSecretStore?.get(1)!, $masterKeyStore?.get(1)!, () => {
+ return new Promise((resolve) => {
+ resolveForDuplicateFileModal = resolve;
+ duplicatedFile = file;
+ isDuplicateFileModalOpen = true;
+ });
+ })
+ .then((res) => {
+ if (!res) return;
+
+ // TODO: FIXME
+ info = getDirectoryInfo(data.id, $masterKeyStore?.get(1)?.key!);
+ window.alert(`'${file.name}' 파일이 업로드되었어요.`);
+ })
+ .catch((e: Error) => {
+ // TODO: FIXME
+ console.error(e);
+ window.alert(`'${file.name}' 파일 업로드에 실패했어요.\n${e.message}`);
+ });
+ }
fileInput!.value = "";
-
- const scanRes = await requestDuplicateFileScan(file, $hmacSecretStore?.get(1)!);
- if (scanRes === null) {
- throw new Error("Failed to scan duplicate files");
- } else if (scanRes.isDuplicate) {
- loadedFile = { ...scanRes, file };
- isDuplicateFileModalOpen = true;
- } else {
- uploadFile({ ...scanRes, file });
- }
};
onMount(async () => {
@@ -97,7 +92,7 @@
파일
-
+
{message}
+
+{/if}
diff --git a/src/routes/(fullscreen)/file/[id]/service.ts b/src/routes/(fullscreen)/file/[id]/service.ts
index fc97c3e..fcc5ce7 100644
--- a/src/routes/(fullscreen)/file/[id]/service.ts
+++ b/src/routes/(fullscreen)/file/[id]/service.ts
@@ -1,31 +1,14 @@
-import { decryptData } from "$lib/modules/crypto";
+import { getFileCache, storeFileCache, downloadFile } from "$lib/modules/file";
-export const requestFileDownload = (
+export const requestFileDownload = async (
fileId: number,
fileEncryptedIv: string,
dataKey: CryptoKey,
) => {
- return new Promise+ {#if $status.status === "download-pending"} + 다운로드를 기다리는 중 + {:else if $status.status === "downloading"} + 다운로드하는 중 + {:else if $status.status === "decryption-pending"} + 복호화를 기다리는 중 + {:else if $status.status === "decrypting"} + 복호화하는 중 + {/if} +
++ {#if $status.status === "downloading"} + 전송됨 + {Math.floor(($status.progress ?? 0) * 100)}% · {formatNetworkSpeed(($status.rate ?? 0) * 8)} + {/if} +
+
+
diff --git a/src/routes/(fullscreen)/file/downloads/File.svelte b/src/routes/(fullscreen)/file/downloads/File.svelte
new file mode 100644
index 0000000..56ee319
--- /dev/null
+++ b/src/routes/(fullscreen)/file/downloads/File.svelte
@@ -0,0 +1,67 @@
+
+
+{#if $fileInfo}
+
+ {#each downloadingFiles as status}
+
+
+
+{/if}
diff --git a/src/routes/(fullscreen)/file/uploads/+page.svelte b/src/routes/(fullscreen)/file/uploads/+page.svelte
new file mode 100644
index 0000000..4e61868
--- /dev/null
+++ b/src/routes/(fullscreen)/file/uploads/+page.svelte
@@ -0,0 +1,29 @@
+
+
+
+ {#if $status.status === "download-pending"}
+
+
+
+ + {$fileInfo.name} +
++ {#if $status.status === "download-pending"} + 다운로드를 기다리는 중 + {:else if $status.status === "downloading"} + 전송됨 + {Math.floor(($status.progress ?? 0) * 100)}% · + {formatNetworkSpeed(($status.rate ?? 0) * 8)} + {:else if $status.status === "decryption-pending"} + 복호화를 기다리는 중 + {:else if $status.status === "decrypting"} + 복호화하는 중 + {:else if $status.status === "decrypted"} + 다운로드 완료 + {:else if $status.status === "error"} + 다운로드 실패 + {/if} +
+
+
diff --git a/src/routes/(fullscreen)/file/uploads/File.svelte b/src/routes/(fullscreen)/file/uploads/File.svelte
new file mode 100644
index 0000000..1a228dc
--- /dev/null
+++ b/src/routes/(fullscreen)/file/uploads/File.svelte
@@ -0,0 +1,57 @@
+
+
+
+ {#each uploadingFiles as status}
+
+
+
diff --git a/src/routes/(fullscreen)/key/export/+page.svelte b/src/routes/(fullscreen)/key/export/+page.svelte
index 297d91d..6cd6ae6 100644
--- a/src/routes/(fullscreen)/key/export/+page.svelte
+++ b/src/routes/(fullscreen)/key/export/+page.svelte
@@ -1,5 +1,5 @@
+
+
+ {#if $status.status === "encryption-pending"}
+
+
+
++ {$status.name} +
++ {#if $status.status === "encryption-pending"} + 준비 중 + {:else if $status.status === "encrypting"} + 암호화하는 중 + {:else if $status.status === "upload-pending"} + 업로드를 기다리는 중 + {:else if $status.status === "uploading"} + 전송됨 + {Math.floor(($status.progress ?? 0) * 100)}% · {formatNetworkSpeed(($status.rate ?? 0) * 8)} + {:else if $status.status === "uploaded"} + 업로드 완료 + {:else if $status.status === "error"} + 업로드 실패 + {/if} +
+
+
diff --git a/src/routes/(fullscreen)/settings/cache/File.svelte b/src/routes/(fullscreen)/settings/cache/File.svelte
new file mode 100644
index 0000000..f21445b
--- /dev/null
+++ b/src/routes/(fullscreen)/settings/cache/File.svelte
@@ -0,0 +1,46 @@
+
+
+
+
+ {:else}
+
+
+ + {fileCache.length}개 파일이 캐시되어 {formatFileSize(fileCacheTotalSize)}를 사용하고 + 있어요. +
+캐시를 삭제하더라도 원본 파일은 삭제되지 않아요.
+
+ {#each fileCache as { index, fileInfo }}
+
+
+
+ {/if}
++ {#if fileCache} + 캐시된 파일이 없어요. + {:else} + 캐시 목록을 불러오고 있어요. + {/if} +
+
+ {#if $info}
+
diff --git a/src/routes/(fullscreen)/settings/cache/service.ts b/src/routes/(fullscreen)/settings/cache/service.ts
new file mode 100644
index 0000000..35b0251
--- /dev/null
+++ b/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);
+};
diff --git a/src/routes/(main)/directory/[[id]]/+page.svelte b/src/routes/(main)/directory/[[id]]/+page.svelte
index 5361fd7..f8bd0c9 100644
--- a/src/routes/(main)/directory/[[id]]/+page.svelte
+++ b/src/routes/(main)/directory/[[id]]/+page.svelte
@@ -4,19 +4,20 @@
import { goto } from "$app/navigation";
import { TopBar } from "$lib/components";
import { FloatingButton } from "$lib/components/buttons";
- import { getDirectoryInfo } from "$lib/modules/file";
- import { masterKeyStore, hmacSecretStore, type DirectoryInfo } from "$lib/stores";
+ import { getDirectoryInfo, type DirectoryInfo } from "$lib/modules/filesystem";
+ import { masterKeyStore, hmacSecretStore } from "$lib/stores";
import CreateBottomSheet from "./CreateBottomSheet.svelte";
import CreateDirectoryModal from "./CreateDirectoryModal.svelte";
import DeleteDirectoryEntryModal from "./DeleteDirectoryEntryModal.svelte";
import DirectoryEntries from "./DirectoryEntries";
import DirectoryEntryMenuBottomSheet from "./DirectoryEntryMenuBottomSheet.svelte";
+ import DownloadStatusCard from "./DownloadStatusCard.svelte";
import DuplicateFileModal from "./DuplicateFileModal.svelte";
import RenameDirectoryEntryModal from "./RenameDirectoryEntryModal.svelte";
+ import UploadStatusCard from "./UploadStatusCard.svelte";
import {
requestHmacSecretDownload,
requestDirectoryCreation,
- requestDuplicateFileScan,
requestFileUpload,
requestDirectoryEntryRename,
requestDirectoryEntryDeletion,
@@ -25,17 +26,12 @@
import IconAdd from "~icons/material-symbols/add";
- interface LoadedFile {
- file: File;
- fileBuffer: ArrayBuffer;
- fileSigned: string;
- }
-
let { data } = $props();
let info: Writable
+
+ {:else}
+
+
+ {/if}
+
+ {#if $info}
+
+
+{$info.name}
+ {:else} +삭제된 파일
+ {/if} ++ 읽음 {formatDate(index.lastRetrievedAt)} · {formatFileSize(index.size)} +
+
{#if data.id !== "root"}
@@ -106,6 +101,10 @@
{#if $info}
{@const topMargin = data.id === "root" ? "mt-4" : ""}
+ {
+ resolveForDuplicateFileModal?.(false);
+ resolveForDuplicateFileModal = undefined;
+ duplicatedFile = undefined;
isDuplicateFileModalOpen = false;
- loadedFile = undefined;
}}
onDuplicateClick={() => {
- uploadFile(loadedFile!);
+ resolveForDuplicateFileModal?.(true);
+ resolveForDuplicateFileModal = undefined;
+ duplicatedFile = undefined;
isDuplicateFileModalOpen = false;
- loadedFile = undefined;
}}
/>
diff --git a/src/routes/(main)/directory/[[id]]/DirectoryEntries/DirectoryEntries.svelte b/src/routes/(main)/directory/[[id]]/DirectoryEntries/DirectoryEntries.svelte
index ea8a984..e482e38 100644
--- a/src/routes/(main)/directory/[[id]]/DirectoryEntries/DirectoryEntries.svelte
+++ b/src/routes/(main)/directory/[[id]]/DirectoryEntries/DirectoryEntries.svelte
@@ -1,11 +1,22 @@
-{#if info.subDirectoryIds.length + info.fileIds.length > 0}
-
+ goto("/file/uploads")} />
+ goto("/file/downloads")} />
+
{#key $info}
- {#each subDirectoryInfos as subDirectory}
- (
- entries: Writable[],
+export const sortEntries = (
+ entries: T[],
sortBy: SortBy = SortBy.NAME_ASC,
) => {
let sortFunc: SortFunc;
@@ -26,17 +27,5 @@ export const sortEntries = (
sortFunc = sortByNameDesc;
}
- entries.sort((a, b) => sortFunc(get(a), get(b)));
-};
-
-const pad2 = (num: number) => num.toString().padStart(2, "0");
-
-export const formatDate = (date: Date) => {
- const year = date.getFullYear();
- const month = date.getMonth() + 1;
- const day = date.getDate();
- const hours = date.getHours();
- const minutes = date.getMinutes();
-
- return `${year}. ${month}. ${day}. ${pad2(hours)}:${pad2(minutes)}`;
+ entries.sort((a, b) => sortFunc(a.name, b.name));
};
diff --git a/src/routes/(main)/directory/[[id]]/DownloadStatusCard.svelte b/src/routes/(main)/directory/[[id]]/DownloadStatusCard.svelte
new file mode 100644
index 0000000..18bb159
--- /dev/null
+++ b/src/routes/(main)/directory/[[id]]/DownloadStatusCard.svelte
@@ -0,0 +1,41 @@
+
+
+{#if downloadingFiles.length > 0}
+
+{/if}
diff --git a/src/routes/(main)/directory/[[id]]/DuplicateFileModal.svelte b/src/routes/(main)/directory/[[id]]/DuplicateFileModal.svelte
index 583fda8..6c9d9af 100644
--- a/src/routes/(main)/directory/[[id]]/DuplicateFileModal.svelte
+++ b/src/routes/(main)/directory/[[id]]/DuplicateFileModal.svelte
@@ -3,30 +3,28 @@
import { Button } from "$lib/components/buttons";
interface Props {
+ file: File | undefined;
onclose: () => void;
onDuplicateClick: () => void;
isOpen: boolean;
}
- let { onclose, onDuplicateClick, isOpen = $bindable() }: Props = $props();
+ let { file, onclose, onDuplicateClick, isOpen = $bindable() }: Props = $props();
-
+ {#each subDirectories as { info }}
+
{:else}
diff --git a/src/routes/(main)/directory/[[id]]/DirectoryEntries/File.svelte b/src/routes/(main)/directory/[[id]]/DirectoryEntries/File.svelte
index c95ba6d..0dad51b 100644
--- a/src/routes/(main)/directory/[[id]]/DirectoryEntries/File.svelte
+++ b/src/routes/(main)/directory/[[id]]/DirectoryEntries/File.svelte
@@ -1,7 +1,7 @@
+
+{#if isFileUploading($status.status)}
+
+
+{/if}
diff --git a/src/routes/(main)/directory/[[id]]/DirectoryEntries/service.ts b/src/routes/(main)/directory/[[id]]/DirectoryEntries/service.ts
index 572378b..b797727 100644
--- a/src/routes/(main)/directory/[[id]]/DirectoryEntries/service.ts
+++ b/src/routes/(main)/directory/[[id]]/DirectoryEntries/service.ts
@@ -1,22 +1,23 @@
-import { get, type Writable } from "svelte/store";
-import type { DirectoryInfo, FileInfo } from "$lib/stores";
-
export enum SortBy {
NAME_ASC,
NAME_DESC,
}
-type SortFunc = (a: DirectoryInfo | FileInfo | null, b: DirectoryInfo | FileInfo | null) => number;
+type SortFunc = (a?: string, b?: string) => number;
+
+const collator = new Intl.Collator(undefined, { numeric: true, sensitivity: "base" });
const sortByNameAsc: SortFunc = (a, b) => {
- if (a && b) return a.name!.localeCompare(b.name!);
+ if (a && b) return collator.compare(a, b);
+ if (a) return -1;
+ if (b) return 1;
return 0;
};
const sortByNameDesc: SortFunc = (a, b) => -sortByNameAsc(a, b);
-export const sortEntries =
+
+
+
+ + {$status.name} +
++ {#if $status.status === "encryption-pending"} + 준비 중 + {:else if $status.status === "encrypting"} + 암호화하는 중 + {:else if $status.status === "upload-pending"} + 업로드를 기다리는 중 + {:else if $status.status === "uploading"} + 전송됨 {Math.floor(($status.progress ?? 0) * 100)}% · + {formatNetworkSpeed(($status.rate ?? 0) * 8)} + {/if} +
+
- ("/api/directory/create", {
- parentId,
+ parent: parentId,
mekVersion: masterKey.version,
dek: await wrapDataKey(dataKey, masterKey.key),
dekVersion: dataKeyVersion.toISOString(),
@@ -66,106 +56,14 @@ export const requestDirectoryCreation = async (
});
};
-export const requestDuplicateFileScan = async (file: File, hmacSecret: HmacSecret) => {
- const fileBuffer = await file.arrayBuffer();
- const fileSigned = encodeToBase64(await signMessageHmac(fileBuffer, hmacSecret.secret));
- const res = await callPostApi("/api/file/scanDuplicates", {
- hskVersion: hmacSecret.version,
- contentHmac: fileSigned,
- });
- if (!res.ok) return null;
-
- const { files }: DuplicateFileScanResponse = await res.json();
- return {
- fileBuffer,
- fileSigned,
- isDuplicate: files.length > 0,
- };
-};
-
-const extractExifDateTime = (fileBuffer: ArrayBuffer) => {
- const exif = ExifReader.load(fileBuffer);
- const dateTimeOriginal = exif["DateTimeOriginal"]?.description;
- const offsetTimeOriginal = exif["OffsetTimeOriginal"]?.description;
- if (!dateTimeOriginal) return undefined;
-
- const [date, time] = dateTimeOriginal.split(" ");
- if (!date || !time) return undefined;
-
- const [year, month, day] = date.split(":").map(Number);
- const [hour, minute, second] = time.split(":").map(Number);
- if (!year || !month || !day || !hour || !minute || !second) return undefined;
-
- if (!offsetTimeOriginal) {
- // No timezone information -> Local timezone
- return new Date(year, month - 1, day, hour, minute, second);
- }
-
- const offsetSign = offsetTimeOriginal[0] === "+" ? 1 : -1;
- const [offsetHour, offsetMinute] = offsetTimeOriginal.slice(1).split(":").map(Number);
-
- const utcDate = Date.UTC(year, month - 1, day, hour, minute, second);
- const offsetMs = offsetSign * ((offsetHour ?? 0) * 60 + (offsetMinute ?? 0)) * 60 * 1000;
- return new Date(utcDate - offsetMs);
-};
-
export const requestFileUpload = async (
file: File,
- fileBuffer: ArrayBuffer,
- fileSigned: string,
parentId: "root" | number,
- masterKey: MasterKey,
hmacSecret: HmacSecret,
+ masterKey: MasterKey,
+ onDuplicate: () => Promise,
) => {
- let createdAt = undefined;
- if (file.type.startsWith("image/")) {
- createdAt = extractExifDateTime(fileBuffer);
- }
-
- const { dataKey, dataKeyVersion } = await generateDataKey();
- const fileEncrypted = await encryptData(fileBuffer, dataKey);
- const nameEncrypted = await encryptString(file.name, dataKey);
- const createdAtEncrypted =
- createdAt && (await encryptString(createdAt.getTime().toString(), dataKey));
- const lastModifiedAtEncrypted = await encryptString(file.lastModified.toString(), dataKey);
-
- const form = new FormData();
- form.set(
- "metadata",
- JSON.stringify({
- parentId,
- mekVersion: masterKey.version,
- dek: await wrapDataKey(dataKey, masterKey.key),
- dekVersion: dataKeyVersion.toISOString(),
- hskVersion: hmacSecret.version,
- contentHmac: fileSigned,
- contentType: file.type,
- contentIv: fileEncrypted.iv,
- name: nameEncrypted.ciphertext,
- nameIv: nameEncrypted.iv,
- createdAt: createdAtEncrypted?.ciphertext,
- createdAtIv: createdAtEncrypted?.iv,
- lastModifiedAt: lastModifiedAtEncrypted.ciphertext,
- lastModifiedAtIv: lastModifiedAtEncrypted.iv,
- } satisfies FileUploadRequest),
- );
- form.set("content", new Blob([fileEncrypted.ciphertext]));
-
- return new Promise((resolve, reject) => {
- // TODO: Progress, Scheduling, ...
-
- const xhr = new XMLHttpRequest();
- xhr.addEventListener("load", () => {
- if (xhr.status === 200) {
- resolve();
- } else {
- reject(new Error(xhr.responseText));
- }
- });
-
- xhr.open("POST", "/api/file/upload");
- xhr.send(form);
- });
+ return await uploadFile(file, parentId, hmacSecret, masterKey, onDuplicate);
};
export const requestDirectoryEntryRename = async (
@@ -190,5 +88,15 @@ export const requestDirectoryEntryRename = async (
};
export const requestDirectoryEntryDeletion = async (entry: SelectedDirectoryEntry) => {
- await callPostApi(`/api/${entry.type}/${entry.id}/delete`);
+ const res = await callPostApi(`/api/${entry.type}/${entry.id}/delete`);
+ if (!res.ok) return false;
+
+ if (entry.type === "directory") {
+ const { deletedFiles }: DirectoryDeleteResponse = await res.json();
+ await Promise.all(deletedFiles.map(deleteFileCache));
+ return true;
+ } else {
+ await deleteFileCache(entry.id);
+ return true;
+ }
};
diff --git a/src/routes/(main)/menu/+page.svelte b/src/routes/(main)/menu/+page.svelte
index deade3d..13ccb92 100644
--- a/src/routes/(main)/menu/+page.svelte
+++ b/src/routes/(main)/menu/+page.svelte
@@ -1,8 +1,9 @@
+
+
+
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 091c034..e4bca97 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,11 +1,28 @@
+[0];
- const form = await request.formData();
- const metadata = form.get("metadata");
- const content = form.get("content");
- if (typeof metadata !== "string" || !(content instanceof File)) {
- error(400, "Invalid request body");
- }
-
- const zodRes = fileUploadRequest.safeParse(JSON.parse(metadata));
+const parseFileMetadata = (userId: number, json: string) => {
+ const zodRes = fileUploadRequest.safeParse(JSON.parse(json));
if (!zodRes.success) error(400, "Invalid request body");
const {
- parentId,
+ parent,
mekVersion,
dek,
dekVersion,
@@ -35,25 +30,77 @@ export const POST: RequestHandler = async ({ locals, request }) => {
if ((createdAt && !createdAtIv) || (!createdAt && createdAtIv))
error(400, "Invalid request body");
- await uploadFile(
- {
- userId,
- parentId,
- mekVersion,
- encDek: dek,
- dekVersion: new Date(dekVersion),
- hskVersion,
- contentHmac,
- contentType,
- encContentIv: contentIv,
- encName: name,
- encNameIv: nameIv,
- encCreatedAt: createdAt ?? null,
- encCreatedAtIv: createdAtIv ?? null,
- encLastModifiedAt: lastModifiedAt,
- encLastModifiedAtIv: lastModifiedAtIv,
- },
- content.stream(),
- );
- return text("File uploaded", { headers: { "Content-Type": "text/plain" } });
+ return {
+ userId,
+ parentId: parent,
+ mekVersion,
+ encDek: dek,
+ dekVersion: new Date(dekVersion),
+ hskVersion,
+ contentHmac,
+ contentType,
+ encContentIv: contentIv,
+ encName: name,
+ encNameIv: nameIv,
+ encCreatedAt: createdAt ?? null,
+ encCreatedAtIv: createdAtIv ?? null,
+ encLastModifiedAt: lastModifiedAt,
+ encLastModifiedAtIv: lastModifiedAtIv,
+ } satisfies FileMetadata;
+};
+
+export const POST: RequestHandler = async ({ locals, request }) => {
+ const { userId } = await authorize(locals, "activeClient");
+
+ const contentType = request.headers.get("Content-Type");
+ if (!contentType?.startsWith("multipart/form-data") || !request.body) {
+ error(400, "Invalid request body");
+ }
+
+ return new Promise((resolve, reject) => {
+ const bb = Busboy({ headers: { "content-type": contentType } });
+ const handler =
+ (f: (...args: T) => Promise) =>
+ (...args: T) => {
+ f(...args).catch(reject);
+ };
+
+ let metadata: FileMetadata | null = null;
+ let content: Readable | null = null;
+ const checksum = new Promise((resolveChecksum, rejectChecksum) => {
+ bb.on(
+ "field",
+ handler(async (fieldname, val) => {
+ if (fieldname === "metadata") {
+ if (!metadata) {
+ // Ignore subsequent metadata fields
+ metadata = parseFileMetadata(userId, val);
+ }
+ } else if (fieldname === "checksum") {
+ resolveChecksum(val); // Ignore subsequent checksum fields
+ } else {
+ error(400, "Invalid request body");
+ }
+ }),
+ );
+ bb.on(
+ "file",
+ handler(async (fieldname, file) => {
+ if (fieldname !== "content") error(400, "Invalid request body");
+ if (!metadata || content) error(400, "Invalid request body");
+ content = file;
+
+ await uploadFile(metadata, content, checksum);
+ resolve(text("File uploaded", { headers: { "Content-Type": "text/plain" } }));
+ }),
+ );
+ bb.on("finish", () => rejectChecksum(new Error("Invalid request body")));
+ bb.on("error", (e) => {
+ content?.emit("error", e) ?? reject(e);
+ rejectChecksum(e);
+ });
+ });
+
+ request.body!.pipeTo(Writable.toWeb(bb)).catch(() => {}); // busboy will handle the error
+ });
};
-
+ {/if}
diff --git a/src/routes/(main)/directory/[[id]]/UploadStatusCard.svelte b/src/routes/(main)/directory/[[id]]/UploadStatusCard.svelte
new file mode 100644
index 0000000..1ac40b3
--- /dev/null
+++ b/src/routes/(main)/directory/[[id]]/UploadStatusCard.svelte
@@ -0,0 +1,39 @@
+
+
+{#if uploadingFiles.length > 0}
+
+{/if}
diff --git a/src/routes/(main)/directory/[[id]]/service.ts b/src/routes/(main)/directory/[[id]]/service.ts
index fa3fcfc..c9a62b2 100644
--- a/src/routes/(main)/directory/[[id]]/service.ts
+++ b/src/routes/(main)/directory/[[id]]/service.ts
@@ -1,23 +1,13 @@
-import ExifReader from "exifreader";
import { callGetApi, callPostApi } from "$lib/hooks";
import { storeHmacSecrets } from "$lib/indexedDB";
-import {
- encodeToBase64,
- generateDataKey,
- wrapDataKey,
- unwrapHmacSecret,
- encryptData,
- encryptString,
- signMessageHmac,
-} from "$lib/modules/crypto";
+import { generateDataKey, wrapDataKey, unwrapHmacSecret, encryptString } from "$lib/modules/crypto";
+import { deleteFileCache, uploadFile } from "$lib/modules/file";
import type {
DirectoryRenameRequest,
DirectoryCreateRequest,
FileRenameRequest,
- FileUploadRequest,
HmacSecretListResponse,
- DuplicateFileScanRequest,
- DuplicateFileScanResponse,
+ DirectoryDeleteResponse,
} from "$lib/server/schemas";
import { hmacSecretStore, type MasterKey, type HmacSecret } from "$lib/stores";
@@ -57,7 +47,7 @@ export const requestDirectoryCreation = async (
const { dataKey, dataKeyVersion } = await generateDataKey();
const nameEncrypted = await encryptString(name, dataKey);
await callPostApi이미 업로드된 파일이에요.
-그래도 업로드할까요?
+ {#if file} + {@const { name } = file} + {@const nameShort = name.length > 20 ? `${name.slice(0, 20)}...` : name} +
+
-
+
+ '{nameShort}' 파일이 있어요.
+예전에 이미 업로드된 파일이에요. 그래도 업로드할까요?
+
+
+
+
-
-
-
-
+
+
+
+ + {@render children?.()} +
+