사소한 리팩토링

src/lib/constants/serviceWorker.ts

@@ -1 +1 @@
-export const DECRYPTED_FILE_URL_PREFIX = "/_internal/decrypted-file/";
+export const DECRYPTED_FILE_URL_PREFIX = "/_internal/decryptedFile/";

src/lib/modules/crypto/aes.ts

@@ -5,7 +5,7 @@ import {
   encodeToBase64,
   decodeFromBase64,
   concatenateBuffers,
-} from "./util";
+} from "./utils";
 
 export const generateMasterKey = async () => {
   return {

src/lib/modules/crypto/index.ts

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

src/lib/modules/crypto/rsa.ts

@@ -1,4 +1,4 @@
-import { encodeString, encodeToBase64, decodeFromBase64 } from "./util";
+import { encodeString, encodeToBase64, decodeFromBase64 } from "./utils";
 
 export const generateEncryptionKeyPair = async () => {
   const keyPair = await crypto.subtle.generateKey(

src/lib/modules/key.ts

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

src/lib/schemas/filesystem.ts

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

src/lib/schemas/index.ts

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

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

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

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

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

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

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

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

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

src/lib/server/schemas/category.ts

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

src/lib/server/schemas/directory.ts

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

src/lib/server/schemas/file.ts

@@ -1,7 +0,0 @@
-import { z } from "zod";
-
-export const fileThumbnailUploadRequest = z.object({
-  dekVersion: z.iso.datetime(),
-  contentIv: z.base64().nonempty(),
-});
-export type FileThumbnailUploadRequest = z.input<typeof fileThumbnailUploadRequest>;

src/lib/server/schemas/index.ts

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

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

@@ -1,7 +1,7 @@
 import { error } from "@sveltejs/kit";
 import { z } from "zod";
-import { authorize } from "$lib/server/modules/auth";
 import { parseRangeHeader, getContentRangeHeader } from "$lib/modules/http";
+import { authorize } from "$lib/server/modules/auth";
 import { getFileStream } from "$lib/server/services/file";
 import type { RequestHandler } from "./$types";
 

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

@@ -1,7 +1,7 @@
 import { error } from "@sveltejs/kit";
 import { z } from "zod";
-import { authorize } from "$lib/server/modules/auth";
 import { parseRangeHeader, getContentRangeHeader } from "$lib/modules/http";
+import { authorize } from "$lib/server/modules/auth";
 import { getFileThumbnailStream } from "$lib/server/services/file";
 import type { RequestHandler } from "./$types";
 

src/trpc/routers/category.ts

@@ -1,14 +1,14 @@
 import { TRPCError } from "@trpc/server";
 import { z } from "zod";
+import { CategoryIdSchema } from "$lib/schemas";
 import { CategoryRepo, FileRepo, IntegrityError } from "$lib/server/db";
-import { categoryIdSchema } from "$lib/server/schemas";
 import { router, roleProcedure } from "../init.server";
 
 const categoryRouter = router({
   get: roleProcedure["activeClient"]
     .input(
       z.object({
-        id: categoryIdSchema,
+        id: CategoryIdSchema,
         recurse: z.boolean().default(false),
       }),
     )
@@ -65,7 +65,7 @@ const categoryRouter = router({
   create: roleProcedure["activeClient"]
     .input(
       z.object({
-        parent: categoryIdSchema,
+        parent: CategoryIdSchema,
         mekVersion: z.int().positive(),
         dek: z.base64().nonempty(),
         dekVersion: z.date(),

src/trpc/routers/directory.ts

@@ -1,15 +1,15 @@
 import { TRPCError } from "@trpc/server";
 import { z } from "zod";
+import { DirectoryIdSchema } from "$lib/schemas";
 import { FileRepo, IntegrityError } from "$lib/server/db";
 import { safeUnlink } from "$lib/server/modules/filesystem";
-import { directoryIdSchema } from "$lib/server/schemas";
 import { router, roleProcedure } from "../init.server";
 
 const directoryRouter = router({
   get: roleProcedure["activeClient"]
     .input(
       z.object({
-        id: directoryIdSchema,
+        id: DirectoryIdSchema,
       }),
     )
     .query(async ({ ctx, input }) => {
@@ -59,7 +59,7 @@ const directoryRouter = router({
   create: roleProcedure["activeClient"]
     .input(
       z.object({
-        parent: directoryIdSchema,
+        parent: DirectoryIdSchema,
         mekVersion: z.int().positive(),
         dek: z.base64().nonempty(),
         dekVersion: z.date(),

src/trpc/routers/upload.ts

@@ -6,11 +6,11 @@ import mime from "mime";
 import { dirname } from "path";
 import { v4 as uuidv4 } from "uuid";
 import { z } from "zod";
+import { DirectoryIdSchema } from "$lib/schemas";
 import { FileRepo, MediaRepo, UploadRepo, IntegrityError } from "$lib/server/db";
 import db from "$lib/server/db/kysely";
 import env from "$lib/server/loadenv";
 import { getChunkDirectoryPath, safeUnlink } from "$lib/server/modules/filesystem";
-import { directoryIdSchema } from "$lib/server/schemas";
 import { router, roleProcedure } from "../init.server";
 
 const uploadLocks = new Set<string>();
@@ -20,7 +20,7 @@ const uploadRouter = router({
     .input(
       z.object({
         chunks: z.int().positive(),
-        parent: directoryIdSchema,
+        parent: DirectoryIdSchema,
         mekVersion: z.int().positive(),
         dek: z.base64().nonempty(),
         dekVersion: z.date(),