原来只有 `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:
+50
-12
@@ -114,7 +114,10 @@ function consume(bucket: RateBucket, burst: number, refillPerSecond: number) {
|
||||
|
||||
/** 文本帧:严格档。会查库,走这一档的都按最坏情况算 */
|
||||
function allowMessage(ws: Bun.ServerWebSocket<SubmissionSocketData>) {
|
||||
const bucket = (ws.data.rate ??= { tokens: RATE_BURST, updatedAt: Date.now() })
|
||||
const bucket = (ws.data.rate ??= {
|
||||
tokens: RATE_BURST,
|
||||
updatedAt: Date.now(),
|
||||
})
|
||||
return consume(bucket, RATE_BURST, RATE_REFILL_PER_SECOND)
|
||||
}
|
||||
|
||||
@@ -213,7 +216,10 @@ export function submissionWebSocketHandler(): Bun.WebSocketHandler<SubmissionSoc
|
||||
liveSockets.add(ws)
|
||||
ws.data.rate = { tokens: RATE_BURST, updatedAt: Date.now() }
|
||||
if (ws.data.kind === "collab") {
|
||||
ws.data.binaryRate = { tokens: COLLAB_BINARY_BURST, updatedAt: Date.now() }
|
||||
ws.data.binaryRate = {
|
||||
tokens: COLLAB_BINARY_BURST,
|
||||
updatedAt: Date.now(),
|
||||
}
|
||||
handleCollabOpen(ws)
|
||||
return
|
||||
}
|
||||
@@ -292,7 +298,10 @@ async function handleMessage(
|
||||
ws.send(JSON.stringify({ type: "pong", timestamp: message.timestamp }))
|
||||
return
|
||||
}
|
||||
if (message.type !== "subscribe" || typeof message.submissionId !== "string") {
|
||||
if (
|
||||
message.type !== "subscribe" ||
|
||||
typeof message.submissionId !== "string"
|
||||
) {
|
||||
ws.send(JSON.stringify({ type: "error", message: "Invalid message" }))
|
||||
return
|
||||
}
|
||||
@@ -336,19 +345,43 @@ async function handleMessage(
|
||||
|
||||
if (!submission) {
|
||||
const [flowchart] = await db
|
||||
.select({ id: schema.flowchartSubmission.id, status: schema.flowchartSubmission.status, score: schema.flowchartSubmission.aiScore, grade: schema.flowchartSubmission.aiGrade })
|
||||
.select({
|
||||
id: schema.flowchartSubmission.id,
|
||||
status: schema.flowchartSubmission.status,
|
||||
score: schema.flowchartSubmission.aiScore,
|
||||
grade: schema.flowchartSubmission.aiGrade,
|
||||
})
|
||||
.from(schema.flowchartSubmission)
|
||||
.where(and(eq(schema.flowchartSubmission.id, message.submissionId), eq(schema.flowchartSubmission.userId, ws.data.userId)))
|
||||
.where(
|
||||
and(
|
||||
eq(schema.flowchartSubmission.id, message.submissionId),
|
||||
eq(schema.flowchartSubmission.userId, ws.data.userId),
|
||||
),
|
||||
)
|
||||
.limit(1)
|
||||
if (!flowchart) {
|
||||
ws.send(JSON.stringify({ type: "error", message: "Submission not found" }))
|
||||
ws.send(
|
||||
JSON.stringify({ type: "error", message: "Submission not found" }),
|
||||
)
|
||||
return
|
||||
}
|
||||
const replay = flowchart.status === 2
|
||||
? { type: "flowchart_evaluation_completed" as const, submissionId: flowchart.id, score: flowchart.score ?? undefined, grade: flowchart.grade ?? undefined }
|
||||
: flowchart.status === 3
|
||||
? { type: "flowchart_evaluation_failed" as const, submissionId: flowchart.id }
|
||||
: { type: "flowchart_evaluation_update" as const, submissionId: flowchart.id }
|
||||
const replay =
|
||||
flowchart.status === 2
|
||||
? {
|
||||
type: "flowchart_evaluation_completed" as const,
|
||||
submissionId: flowchart.id,
|
||||
score: flowchart.score ?? undefined,
|
||||
grade: flowchart.grade ?? undefined,
|
||||
}
|
||||
: flowchart.status === 3
|
||||
? {
|
||||
type: "flowchart_evaluation_failed" as const,
|
||||
submissionId: flowchart.id,
|
||||
}
|
||||
: {
|
||||
type: "flowchart_evaluation_update" as const,
|
||||
submissionId: flowchart.id,
|
||||
}
|
||||
ws.send(JSON.stringify(replay satisfies FlowchartUpdate))
|
||||
return
|
||||
}
|
||||
@@ -407,7 +440,12 @@ export async function bridgeSubmissionEvents(
|
||||
const [activeUser] = await db
|
||||
.select({ id: schema.user.id })
|
||||
.from(schema.user)
|
||||
.where(and(eq(schema.user.id, event.userId), eq(schema.user.isDisabled, false)))
|
||||
.where(
|
||||
and(
|
||||
eq(schema.user.id, event.userId),
|
||||
eq(schema.user.isDisabled, false),
|
||||
),
|
||||
)
|
||||
.limit(1)
|
||||
if (!activeUser) return
|
||||
server.publish(topic, JSON.stringify(event.data))
|
||||
|
||||
Reference in New Issue
Block a user