refac: rearrange files

SharzyL · SharzyL · commit 732c2373ed03 · 2025-05-01T09:20:02.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,6 @@ Cargo.lock
 bin/
 pkg/
 wasm-pack.log
-worker/
 node_modules/
 .cargo-ok
 
diff --git a/frontend/components/DecryptPaste.tsx b/frontend/components/DecryptPaste.tsx
@@ -6,7 +6,7 @@ import { Button, CircularProgress, Link, Tooltip } from "@heroui/react"
 import { CheckIcon, CopyIcon, DownloadIcon, HomeIcon } from "./icons.js"
 
 import "../style.css"
-import { parseFilenameFromContentDisposition, parsePath } from "../../src/shared.js"
+import { parseFilenameFromContentDisposition, parsePath } from "../../shared/parsers.js"
 import { formatSize } from "../utils/utils.js"
 import { DarkMode, DarkModeToggle, defaultDarkMode, shouldBeDark } from "./DarkModeToggle.js"
 import binaryExtensions from "binary-extensions"
diff --git a/frontend/components/PasteBin.tsx b/frontend/components/PasteBin.tsx
@@ -2,7 +2,8 @@ import React, { useEffect, useState } from "react"
 
 import { Button, Link } from "@heroui/react"
 
-import { PasteResponse, parsePath, parseFilenameFromContentDisposition } from "../../src/shared.js"
+import { PasteResponse } from "../../shared/interfaces.js"
+import { parsePath, parseFilenameFromContentDisposition } from "../../shared/parsers.js"
 
 import { DarkModeToggle, DarkMode, defaultDarkMode, shouldBeDark } from "./DarkModeToggle.js"
 import { ErrorModal, ErrorState } from "./ErrorModal.js"
diff --git a/frontend/components/UploadedPanel.tsx b/frontend/components/UploadedPanel.tsx
@@ -1,6 +1,6 @@
 import { Card, CardBody, CardHeader, CardProps, Divider, Skeleton, Snippet } from "@heroui/react"
 import React from "react"
-import { PasteResponse } from "../../src/shared.js"
+import { PasteResponse } from "../../shared/interfaces.js"
 
 interface UploadedPanelProps extends CardProps {
   pasteResponse: PasteResponse | null
diff --git a/frontend/test/crypto.spec.ts b/frontend/test/crypto.spec.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect } from "vitest"
 import { encrypt, decrypt, genKey, encodeKey, decodeKey } from "../utils/encryption.js"
-import { genRandStr } from "../../src/common.js"
+import { genRandStr } from "../../worker/common.js"
 
 function randArray(len: number): Uint8Array {
   const arr = new Uint8Array(len)
diff --git a/frontend/test/index.spec.tsx b/frontend/test/index.spec.tsx
@@ -35,7 +35,7 @@ afterAll(() => {
 
 import "@testing-library/jest-dom/vitest"
 import { userEvent } from "@testing-library/user-event"
-import { PasteResponse } from "../../src/shared.js"
+import { PasteResponse } from "../../shared/interfaces.js"
 import { setupServer } from "msw/node"
 import { http, HttpResponse } from "msw"
 
diff --git a/frontend/utils/utils.ts b/frontend/utils/utils.ts
@@ -1,4 +1,5 @@
-import { NAME_REGEX, parseExpiration, parseExpirationReadable, PASSWD_SEP } from "../../src/shared.js"
+import { NAME_REGEX, PASSWD_SEP } from "../../shared/constants.js"
+import { parseExpiration, parseExpirationReadable } from "../../shared/parsers.js"
 
 export const BaseUrl = DEPLOY_URL
 export const APIUrl = API_URL
diff --git a/shared/constants.ts b/shared/constants.ts
@@ -0,0 +1,9 @@
+export const CHAR_GEN = "ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678"
+export const NAME_REGEX = /^[a-zA-Z0-9+_\-[\]*$@,;]{3,}$/
+export const PASTE_NAME_LEN = 4
+export const PRIVATE_PASTE_NAME_LEN = 24
+export const DEFAULT_PASSWD_LEN = 24
+export const MAX_PASSWD_LEN = 128
+export const MIN_PASSWD_LEN = 8
+export const MAX_URL_REDIRECT_LEN = 2000
+export const PASSWD_SEP = ":"
diff --git a/shared/interfaces.ts b/shared/interfaces.ts
@@ -0,0 +1,27 @@
+// This file contains things shared with frontend
+
+export type PasteLocation = "KV" | "R2"
+
+export type PasteResponse = {
+  url: string
+  suggestedUrl?: string
+  manageUrl: string
+  expirationSeconds: number
+  expireAt: string
+}
+
+export type MetaResponse = {
+  lastModifiedAt: string
+  createdAt: string
+  expireAt: string
+  sizeBytes: number
+  location: PasteLocation
+  filename?: string
+  encryptionScheme?: string
+}
+
+export type MPUCreateResponse = {
+  name: string
+  key: string
+  uploadId: string
+}
diff --git a/shared/parsers.ts b/shared/parsers.ts
@@ -1,40 +1,4 @@
-// This file contains things shared with frontend
-
-export type PasteLocation = "KV" | "R2"
-
-export type PasteResponse = {
-  url: string
-  suggestedUrl?: string
-  manageUrl: string
-  expirationSeconds: number
-  expireAt: string
-}
-
-export type MetaResponse = {
-  lastModifiedAt: string
-  createdAt: string
-  expireAt: string
-  sizeBytes: number
-  location: PasteLocation
-  filename?: string
-  encryptionScheme?: string
-}
-
-export type MPUCreateResponse = {
-  name: string
-  key: string
-  uploadId: string
-}
-
-export const CHAR_GEN = "ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678"
-export const NAME_REGEX = /^[a-zA-Z0-9+_\-[\]*$@,;]{3,}$/
-export const PASTE_NAME_LEN = 4
-export const PRIVATE_PASTE_NAME_LEN = 24
-export const DEFAULT_PASSWD_LEN = 24
-export const MAX_PASSWD_LEN = 128
-export const MIN_PASSWD_LEN = 8
-export const MAX_URL_REDIRECT_LEN = 2000
-export const PASSWD_SEP = ":"
+import { PASSWD_SEP } from "./constants.js"
 
 export function parseSize(sizeStr: string): number | null {
   sizeStr = sizeStr.trim()
diff --git a/shared/test/parser.spec.ts b/shared/test/parser.spec.ts
@@ -5,7 +5,7 @@ import {
   parseFilenameFromContentDisposition,
   parseExpiration,
   parseExpirationReadable,
-} from "../src/shared"
+} from "../parsers.js"
 
 test("parsePath", () => {
   const testPairs: [string, ParsedPath][] = [
diff --git a/shared/uploadMPU.ts b/shared/uploadMPU.ts
@@ -1,6 +1,6 @@
 // we will move this file to a shared directory later
 
-import { MPUCreateResponse, PasteResponse } from "./shared.js"
+import { MPUCreateResponse, PasteResponse } from "./interfaces.js"
 
 export class UploadError extends Error {
   public statusCode: number
diff --git a/test/tsconfig.json b/test/tsconfig.json
diff --git a/vitest.workspace.ts b/vitest.workspace.ts
@@ -5,7 +5,7 @@ export default defineWorkspace([
   defineWorkersProject({
     test: {
       name: "Workers",
-      include: ["test/**/*.spec.ts"],
+      include: ["worker/test/**/*.spec.ts"],
       coverage: {
         provider: "istanbul", // v8 is not supported due for cf workers
         reporter: ["text", "json-summary", "html", "json"],
diff --git a/worker/common.ts b/worker/common.ts
@@ -1,4 +1,4 @@
-import { CHAR_GEN } from "./shared.js"
+import { CHAR_GEN } from "../shared/constants.js"
 
 export function decode(arrayBuffer: ArrayBuffer): string {
   return new TextDecoder().decode(arrayBuffer)
diff --git a/worker/handlers/handleCors.ts b/worker/handlers/handleCors.ts
diff --git a/worker/handlers/handleDelete.ts b/worker/handlers/handleDelete.ts
@@ -1,6 +1,6 @@
 import { WorkerError } from "../common.js"
 import { deletePaste, getPasteMetadata } from "../storage/storage.js"
-import { parsePath } from "../shared.js"
+import { parsePath } from "../../shared/parsers.js"
 
 export async function handleDelete(request: Request, env: Env, _: ExecutionContext) {
   const url = new URL(request.url)
diff --git a/worker/handlers/handleMPU.ts b/worker/handlers/handleMPU.ts
@@ -1,4 +1,5 @@
-import { MPUCreateResponse, NAME_REGEX, PASTE_NAME_LEN, PRIVATE_PASTE_NAME_LEN } from "../shared.js"
+import { MPUCreateResponse } from "../../shared/interfaces.js"
+import { NAME_REGEX, PASTE_NAME_LEN, PRIVATE_PASTE_NAME_LEN } from "../../shared/constants.js"
 import { genRandStr, WorkerError } from "../common.js"
 import { getPasteMetadata, pasteNameAvailable } from "../storage/storage.js"
 
diff --git a/worker/handlers/handleRead.ts b/worker/handlers/handleRead.ts
@@ -1,11 +1,13 @@
 import { decode, isLegalUrl, WorkerError } from "../common.js"
 import { getDocPage } from "../pages/docs.js"
-import { verifyAuth } from "../auth.js"
+import { verifyAuth } from "../pages/auth.js"
 import mime from "mime/lite"
 import { makeMarkdown } from "../pages/markdown.js"
 import { makeHighlight } from "../pages/highlight.js"
 import { getPaste, getPasteMetadata, PasteMetadata, PasteWithMetadata } from "../storage/storage.js"
-import { MAX_URL_REDIRECT_LEN, MetaResponse, parsePath } from "../shared.js"
+import { MetaResponse } from "../../shared/interfaces.js"
+import { parsePath } from "../../shared/parsers.js"
+import { MAX_URL_REDIRECT_LEN } from "../../shared/constants.js"
 
 type Headers = Record<string, string>
 
diff --git a/worker/handlers/handleWrite.ts b/worker/handlers/handleWrite.ts
@@ -1,19 +1,17 @@
-import { verifyAuth } from "../auth.js"
+import { verifyAuth } from "../pages/auth.js"
 import { decode, genRandStr, isLegalUrl, WorkerError } from "../common.js"
 import { createPaste, getPasteMetadata, pasteNameAvailable, updatePaste } from "../storage/storage.js"
 import {
   DEFAULT_PASSWD_LEN,
   NAME_REGEX,
   PASTE_NAME_LEN,
-  PasteResponse,
   PRIVATE_PASTE_NAME_LEN,
   PASSWD_SEP,
-  parseExpiration,
-  parsePath,
   MIN_PASSWD_LEN,
   MAX_PASSWD_LEN,
-  parseSize,
-} from "../shared.js"
+} from "../../shared/constants.js"
+import { parsePath, parseSize, parseExpiration } from "../../shared/parsers.js"
+import { PasteResponse } from "../../shared/interfaces.js"
 import { MaxFileSizeExceededError, MultipartParseError, parseMultipartRequest } from "@mjackson/multipart-parser"
 import { handleMPUComplete, handleMPUCreate, handleMPUCreateUpdate, handleMPUResume } from "./handleMPU.js"
 
diff --git a/worker/index.ts b/worker/index.ts
diff --git a/worker/pages/auth.ts b/worker/pages/auth.ts
@@ -1,4 +1,4 @@
-import { atob_utf8, btoa_utf8, WorkerError } from "./common.js"
+import { atob_utf8, btoa_utf8, WorkerError } from "../common.js"
 
 // Encoding function
 export function encodeBasicAuth(username: string, password: string): string {
diff --git a/worker/pages/docs.ts b/worker/pages/docs.ts
diff --git a/worker/pages/highlight.ts b/worker/pages/highlight.ts
diff --git a/worker/pages/markdown.ts b/worker/pages/markdown.ts
diff --git a/worker/storage/storage.ts b/worker/storage/storage.ts
@@ -1,6 +1,6 @@
 import { dateToUnix, WorkerError } from "../common.js"
-import { parseSize } from "../shared.js"
-import { PasteLocation } from "../shared.js"
+import { parseSize } from "../../shared/parsers.js"
+import { PasteLocation } from "../../shared/interfaces.js"
 
 // since CF does not allow expiration shorter than 60s, extend the expiration to 70s
 const PASTE_EXPIRE_SPECIFIED_MIN = 70
diff --git a/worker/test/accessCounter.spec.ts b/worker/test/accessCounter.spec.ts
@@ -1,7 +1,7 @@
 import { expect, it, beforeEach, vi, afterEach } from "vitest"
-import { genRandomBlob, upload, workerFetch } from "./testUtils.js"
+import { genRandomBlob, upload, workerFetch } from "./testUtils"
 import { createExecutionContext, env, waitOnExecutionContext } from "cloudflare:test"
-import { PasteMetadata } from "../src/storage/storage"
+import { PasteMetadata } from "../storage/storage"
 
 beforeEach(() => {
   vi.spyOn(Math, "random").mockReturnValue(0)
diff --git a/worker/test/assets/wrangler_basic_auth.toml b/worker/test/assets/wrangler_basic_auth.toml
diff --git a/worker/test/basic.spec.ts b/worker/test/basic.spec.ts
@@ -1,6 +1,6 @@
 import { test, it, expect, describe } from "vitest"
 
-import { genRandStr } from "../src/common"
+import { genRandStr } from "../common"
 
 import {
   genRandomBlob,
@@ -12,9 +12,10 @@ import {
   uploadExpectStatus,
   staticPages,
   addRole,
-} from "./testUtils.js"
+} from "./testUtils"
 import { createExecutionContext } from "cloudflare:test"
-import { DEFAULT_PASSWD_LEN, parsePath, PASTE_NAME_LEN } from "../src/shared"
+import { DEFAULT_PASSWD_LEN, PASTE_NAME_LEN } from "../../shared/constants"
+import { parsePath } from "../../shared/parsers"
 
 describe("upload", () => {
   const blob1 = genRandomBlob(1024)
diff --git a/worker/test/basicAuth.spec.ts b/worker/test/basicAuth.spec.ts
@@ -1,6 +1,6 @@
 import { expect, test, it, describe, beforeEach, afterEach } from "vitest"
-import { areBlobsEqual, BASE_URL, genRandomBlob, upload, uploadExpectStatus, workerFetch } from "./testUtils.js"
-import { encodeBasicAuth, decodeBasicAuth } from "../src/auth.js"
+import { areBlobsEqual, BASE_URL, genRandomBlob, upload, uploadExpectStatus, workerFetch } from "./testUtils"
+import { encodeBasicAuth, decodeBasicAuth } from "../pages/auth"
 import { createExecutionContext, env } from "cloudflare:test"
 
 test("basic auth encode and decode", () => {
diff --git a/worker/test/controlHeaders.spec.ts b/worker/test/controlHeaders.spec.ts
@@ -1,7 +1,7 @@
 import { createExecutionContext, env } from "cloudflare:test"
 import { afterEach, beforeEach, expect, test, vi } from "vitest"
 
-import { BASE_URL, genRandomBlob, upload, workerFetch } from "./testUtils.js"
+import { BASE_URL, genRandomBlob, upload, workerFetch } from "./testUtils"
 
 test("mime type", async () => {
   const ctx = createExecutionContext()
diff --git a/worker/test/env.d.ts b/worker/test/env.d.ts
diff --git a/worker/test/head.spec.ts b/worker/test/head.spec.ts
diff --git a/worker/test/mpu.spec.ts b/worker/test/mpu.spec.ts
@@ -1,8 +1,9 @@
-import { uploadMPU } from "../src/uploadMPU"
+import { uploadMPU } from "../../shared/uploadMPU"
 import { vi, test, describe, it, expect, afterAll, beforeEach } from "vitest"
 import { createExecutionContext } from "cloudflare:test"
 import { areBlobsEqual, BASE_URL, genRandomBlob, workerFetch } from "./testUtils"
-import { parsePath, PRIVATE_PASTE_NAME_LEN } from "../src/shared"
+import { PRIVATE_PASTE_NAME_LEN } from "../../shared/constants"
+import { parsePath } from "../../shared/parsers"
 
 const ctx = createExecutionContext()
 beforeEach(() => {
diff --git a/worker/test/r2.spec.ts b/worker/test/r2.spec.ts
@@ -1,8 +1,9 @@
 import { expect, test, vi, beforeEach, afterEach } from "vitest"
 import { addRole, areBlobsEqual, genRandomBlob, upload, workerFetch } from "./testUtils"
-import { MetaResponse, parseSize } from "../src/shared"
+import { MetaResponse } from "../../shared/interfaces"
+import { parseSize } from "../../shared/parsers"
 import { createExecutionContext, createScheduledController, env, waitOnExecutionContext } from "cloudflare:test"
-import worker from "../src/index.js"
+import worker from "../index"
 
 beforeEach(vi.useFakeTimers)
 afterEach(vi.useRealTimers)
diff --git a/worker/test/roles.spec.ts b/worker/test/roles.spec.ts
@@ -1,8 +1,8 @@
 import { expect, test, describe, it, beforeEach, vi, afterEach } from "vitest"
-import { addRole, upload, workerFetch } from "./testUtils.js"
+import { addRole, upload, workerFetch } from "./testUtils"
 import { createExecutionContext } from "cloudflare:test"
-import { MetaResponse } from "../src/shared"
-import { genRandStr } from "../src/common"
+import { MetaResponse } from "../../shared/interfaces"
+import { genRandStr } from "../common"
 
 const testMd: string = `
 # Header 1
diff --git a/worker/test/testUtils.ts b/worker/test/testUtils.ts
@@ -3,8 +3,8 @@ import { env } from "cloudflare:test"
 import { expect } from "vitest"
 import crypto from "crypto"
 
-import worker from "../src/index.js"
-import { PasteResponse } from "../src/shared"
+import worker from "../index"
+import { PasteResponse } from "../../shared/interfaces"
 
 export const BASE_URL: string = env.DEPLOY_URL
 export const RAND_NAME_REGEX = /^[ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678]+$/
diff --git a/worker/test/tsconfig.json b/worker/test/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "types": ["@cloudflare/vitest-pool-workers", "../../worker-configuration.d.ts"],
+    "moduleResolution": "bundler",
+    "strict": true
+  },
+  "include": ["**/*.ts"]
+}
diff --git a/worker/test/uploadOptions.spec.ts b/worker/test/uploadOptions.spec.ts
@@ -10,7 +10,9 @@ import {
   workerFetch,
 } from "./testUtils"
 import { createExecutionContext, env } from "cloudflare:test"
-import { MAX_PASSWD_LEN, MetaResponse, MIN_PASSWD_LEN, parseExpiration, PRIVATE_PASTE_NAME_LEN } from "../src/shared"
+import { MetaResponse } from "../../shared/interfaces"
+import { MAX_PASSWD_LEN, MIN_PASSWD_LEN, PRIVATE_PASTE_NAME_LEN } from "../../shared/constants"
+import { parseExpiration } from "../../shared/parsers"
 
 test("privacy url with option p", async () => {
   const blob1 = genRandomBlob(1024)
diff --git a/worker/tsconfig.json b/worker/tsconfig.json
diff --git a/wrangler.toml b/wrangler.toml
@@ -2,7 +2,7 @@ name = "pb"
 compatibility_date = "2025-04-24"
 
 workers_dev = false
-main = "src/index.ts"
+main = "worker/index.ts"
 
 [[rules]]
 type = "Text"
@@ -74,4 +74,4 @@ R2_THRESHOLD = "100K"
 R2_MAX_ALLOWED = "100M"
 
 # The following mimetypes will be converted to text/plain
-DISALLOWED_MIME_FOR_PASTE = ["text/html"]
+DISALLOWED_MIME_FOR_PASTE = ["text/html"]
