原来只有 `apps/web` 在 Prettier 下(配置在 `apps/web/.prettierrc.toml`、脚本在 web 的 package.json),后端和契约从来没格式化过 —— 手写在 100 列上下,`db/schema.ts` 还是 drizzle-kit pull 留下的 tab 缩进。两套口径分叉久了,跨端改一处就得记着「这边 什么风格」。 - 配置搬到根目录 `.prettierrc.toml`,内容不变(`semi=false`,其余全默认, printWidth 80 —— 和前端已有的格式一致,不另立一套宽度); - 脚本统一成根目录 `bun run fmt`,覆盖 `apps/*/src`、`apps/web/tests` 和两个构建 配置;web 自己那份 `fmt` 和重复的 prettier 依赖删掉; - `.prettierignore` 挡掉两类不该碰的:drizzle-kit 生成的 `src/db/meta/` 结构快照 (它是 db:generate 的比对输入,只该由 drizzle-kit 写)、unplugin 每次 dev 都会 重写的 `auto-imports.d.ts` / `components.d.ts`; - 全量跑了一遍。纯格式,无行为改动:api typecheck / check:routes / check:ast、 前端 type-check 全过,起 api 打了接口确认正常。前端这 39 个文件的小改动是 prettier 版本漂移(类型断言的换行口径变了),不是新配置带来的。 Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
+89
-73
@@ -44,16 +44,16 @@ app.route("/api", judgeServerRoutes)
|
||||
app.route("/api/admin", adminRoutes)
|
||||
|
||||
app.onError((error, c) => {
|
||||
console.error(error)
|
||||
return c.json(
|
||||
{ error: { code: "internal-error", message: "Internal server error" } },
|
||||
500,
|
||||
)
|
||||
console.error(error)
|
||||
return c.json(
|
||||
{ error: { code: "internal-error", message: "Internal server error" } },
|
||||
500,
|
||||
)
|
||||
})
|
||||
|
||||
/** 头像取不到时的占位图,避免每个没设头像的学生都打一次 404 */
|
||||
const DEFAULT_AVATAR_SVG =
|
||||
'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><rect width="128" height="128" rx="64" fill="#e2e8f0"/><circle cx="64" cy="48" r="24" fill="#94a3b8"/><path d="M20 120c4-28 22-42 44-42s40 14 44 42" fill="#94a3b8"/></svg>'
|
||||
'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><rect width="128" height="128" rx="64" fill="#e2e8f0"/><circle cx="64" cy="48" r="24" fill="#94a3b8"/><path d="M20 120c4-28 22-42 44-42s40 14 44 42" fill="#94a3b8"/></svg>'
|
||||
|
||||
/**
|
||||
* 伺服 /public 下的用户上传文件。
|
||||
@@ -64,76 +64,92 @@ const DEFAULT_AVATAR_SVG =
|
||||
* 生产环境这些请求也走后端(Caddy 把 /public/* 整段反代过来),不让 Caddy 直接读盘:
|
||||
* 这样开发(Vite 代理)和生产是同一条代码路径,少一处只在服务器上才出错的差异。
|
||||
*/
|
||||
async function serveUpload(pathname: string, prefix: string, directory: string) {
|
||||
const decoded = decodeURIComponent(pathname)
|
||||
const filename = basename(decoded)
|
||||
if (!filename || filename !== decoded.slice(prefix.length + 1)) {
|
||||
return new Response("Not found", { status: 404 })
|
||||
}
|
||||
const file = Bun.file(resolve(directory, filename))
|
||||
if (await file.exists()) {
|
||||
// 文件名由后端生成且内容不变,可以放心长缓存
|
||||
return new Response(file, { headers: { "cache-control": "public, max-age=86400" } })
|
||||
}
|
||||
return null
|
||||
async function serveUpload(
|
||||
pathname: string,
|
||||
prefix: string,
|
||||
directory: string,
|
||||
) {
|
||||
const decoded = decodeURIComponent(pathname)
|
||||
const filename = basename(decoded)
|
||||
if (!filename || filename !== decoded.slice(prefix.length + 1)) {
|
||||
return new Response("Not found", { status: 404 })
|
||||
}
|
||||
const file = Bun.file(resolve(directory, filename))
|
||||
if (await file.exists()) {
|
||||
// 文件名由后端生成且内容不变,可以放心长缓存
|
||||
return new Response(file, {
|
||||
headers: { "cache-control": "public, max-age=86400" },
|
||||
})
|
||||
}
|
||||
return null
|
||||
}
|
||||
|
||||
const server = Bun.serve<SubmissionSocketData>({
|
||||
port: config.port,
|
||||
async fetch(request, bunServer) {
|
||||
const url = new URL(request.url)
|
||||
if (url.pathname.startsWith(`${config.avatarUriPrefix}/`)) {
|
||||
const hit = await serveUpload(url.pathname, config.avatarUriPrefix, config.avatarDirectory)
|
||||
if (hit) return hit
|
||||
if (basename(decodeURIComponent(url.pathname)) === "default.png") {
|
||||
return new Response(DEFAULT_AVATAR_SVG, {
|
||||
headers: { "content-type": "image/svg+xml", "cache-control": "public, max-age=3600" },
|
||||
})
|
||||
}
|
||||
return new Response("Not found", { status: 404 })
|
||||
}
|
||||
// 题面里插的图片。原来没有这一段 —— 后台上传成功、返回 /public/upload/xxx,
|
||||
// 但没有任何路由伺服它,题面图片一律 404。
|
||||
if (url.pathname.startsWith(`${config.uploadUriPrefix}/`)) {
|
||||
return (
|
||||
(await serveUpload(url.pathname, config.uploadUriPrefix, config.uploadDirectory)) ??
|
||||
new Response("Not found", { status: 404 })
|
||||
)
|
||||
}
|
||||
if (
|
||||
url.pathname === "/ws/submissions" ||
|
||||
url.pathname === "/ws/config" ||
|
||||
url.pathname === "/ws/collab"
|
||||
) {
|
||||
if (!isAllowedWebSocketOrigin(request.headers.get("origin"), url)) {
|
||||
return new Response("Forbidden", { status: 403 })
|
||||
}
|
||||
const user = await getRequestSessionUser(request)
|
||||
if (!user) return new Response("Unauthorized", { status: 401 })
|
||||
const kind =
|
||||
url.pathname === "/ws/config"
|
||||
? "config"
|
||||
: url.pathname === "/ws/collab"
|
||||
? "collab"
|
||||
: "submissions"
|
||||
if (
|
||||
bunServer.upgrade(request, {
|
||||
data: {
|
||||
userId: user.id,
|
||||
kind,
|
||||
token: readRequestSessionToken(request),
|
||||
username: user.username,
|
||||
adminType: user.adminType,
|
||||
},
|
||||
})
|
||||
) {
|
||||
return undefined
|
||||
}
|
||||
return new Response("WebSocket upgrade failed", { status: 400 })
|
||||
}
|
||||
return app.fetch(request)
|
||||
},
|
||||
websocket: submissionWebSocketHandler(),
|
||||
port: config.port,
|
||||
async fetch(request, bunServer) {
|
||||
const url = new URL(request.url)
|
||||
if (url.pathname.startsWith(`${config.avatarUriPrefix}/`)) {
|
||||
const hit = await serveUpload(
|
||||
url.pathname,
|
||||
config.avatarUriPrefix,
|
||||
config.avatarDirectory,
|
||||
)
|
||||
if (hit) return hit
|
||||
if (basename(decodeURIComponent(url.pathname)) === "default.png") {
|
||||
return new Response(DEFAULT_AVATAR_SVG, {
|
||||
headers: {
|
||||
"content-type": "image/svg+xml",
|
||||
"cache-control": "public, max-age=3600",
|
||||
},
|
||||
})
|
||||
}
|
||||
return new Response("Not found", { status: 404 })
|
||||
}
|
||||
// 题面里插的图片。原来没有这一段 —— 后台上传成功、返回 /public/upload/xxx,
|
||||
// 但没有任何路由伺服它,题面图片一律 404。
|
||||
if (url.pathname.startsWith(`${config.uploadUriPrefix}/`)) {
|
||||
return (
|
||||
(await serveUpload(
|
||||
url.pathname,
|
||||
config.uploadUriPrefix,
|
||||
config.uploadDirectory,
|
||||
)) ?? new Response("Not found", { status: 404 })
|
||||
)
|
||||
}
|
||||
if (
|
||||
url.pathname === "/ws/submissions" ||
|
||||
url.pathname === "/ws/config" ||
|
||||
url.pathname === "/ws/collab"
|
||||
) {
|
||||
if (!isAllowedWebSocketOrigin(request.headers.get("origin"), url)) {
|
||||
return new Response("Forbidden", { status: 403 })
|
||||
}
|
||||
const user = await getRequestSessionUser(request)
|
||||
if (!user) return new Response("Unauthorized", { status: 401 })
|
||||
const kind =
|
||||
url.pathname === "/ws/config"
|
||||
? "config"
|
||||
: url.pathname === "/ws/collab"
|
||||
? "collab"
|
||||
: "submissions"
|
||||
if (
|
||||
bunServer.upgrade(request, {
|
||||
data: {
|
||||
userId: user.id,
|
||||
kind,
|
||||
token: readRequestSessionToken(request),
|
||||
username: user.username,
|
||||
adminType: user.adminType,
|
||||
},
|
||||
})
|
||||
) {
|
||||
return undefined
|
||||
}
|
||||
return new Response("WebSocket upgrade failed", { status: 400 })
|
||||
}
|
||||
return app.fetch(request)
|
||||
},
|
||||
websocket: submissionWebSocketHandler(),
|
||||
})
|
||||
|
||||
await bridgeSubmissionEvents(server)
|
||||
|
||||
Reference in New Issue
Block a user