原来只有 `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:
@@ -86,7 +86,10 @@ export function handleCollabOpen(ws: CollabSocket) {
|
||||
addTeacher(ws)
|
||||
// 新上线的老师要立刻看到当前队列,不能等下一次变更
|
||||
ws.send(
|
||||
JSON.stringify({ type: "requests", list: listRequests().map(serializeRequest) }),
|
||||
JSON.stringify({
|
||||
type: "requests",
|
||||
list: listRequests().map(serializeRequest),
|
||||
}),
|
||||
)
|
||||
return
|
||||
}
|
||||
@@ -159,7 +162,8 @@ export function handleCollabClose(ws: CollabSocket) {
|
||||
closeRoom(room.studentId)
|
||||
room.studentSocket.data.roomOwnerId = undefined
|
||||
room.teacherSocket.data.roomOwnerId = undefined
|
||||
const peer = ws === room.teacherSocket ? room.studentSocket : room.teacherSocket
|
||||
const peer =
|
||||
ws === room.teacherSocket ? room.studentSocket : room.teacherSocket
|
||||
peer.send(JSON.stringify({ type: "room_closed", reason: "peer_offline" }))
|
||||
|
||||
if (ws === room.teacherSocket) {
|
||||
@@ -197,7 +201,9 @@ export async function handleCollabMessage(ws: CollabSocket, raw: string) {
|
||||
|
||||
// 心跳不查库,和 /ws/submissions 的处理一致
|
||||
if (message.type === "ping") {
|
||||
ws.send(JSON.stringify({ type: "pong", timestamp: (message as any).timestamp }))
|
||||
ws.send(
|
||||
JSON.stringify({ type: "pong", timestamp: (message as any).timestamp }),
|
||||
)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -261,7 +267,9 @@ async function handleHelpRequest(
|
||||
)
|
||||
.limit(1)
|
||||
if (!problem) {
|
||||
ws.send(JSON.stringify({ type: "error", message: "题目不存在或不支持求助" }))
|
||||
ws.send(
|
||||
JSON.stringify({ type: "error", message: "题目不存在或不支持求助" }),
|
||||
)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -339,7 +347,12 @@ async function handleAccept(ws: CollabSocket, studentId: unknown) {
|
||||
const [teacher] = await db
|
||||
.select({ adminType: schema.user.adminType })
|
||||
.from(schema.user)
|
||||
.where(and(eq(schema.user.id, ws.data.userId), eq(schema.user.isDisabled, false)))
|
||||
.where(
|
||||
and(
|
||||
eq(schema.user.id, ws.data.userId),
|
||||
eq(schema.user.isDisabled, false),
|
||||
),
|
||||
)
|
||||
.limit(1)
|
||||
if (!teacher || !TEACHER_ROLES.includes(toAdminType(teacher.adminType))) {
|
||||
ws.close(1008, "Permission revoked")
|
||||
@@ -363,7 +376,10 @@ async function handleAccept(ws: CollabSocket, studentId: unknown) {
|
||||
// (正常路径走不到,是两个标签页 + 断线重连缝隙的最后一道闸)——
|
||||
// 回一份最新列表让老师端自己纠正
|
||||
ws.send(
|
||||
JSON.stringify({ type: "requests", list: listRequests().map(serializeRequest) }),
|
||||
JSON.stringify({
|
||||
type: "requests",
|
||||
list: listRequests().map(serializeRequest),
|
||||
}),
|
||||
)
|
||||
return
|
||||
}
|
||||
@@ -404,7 +420,12 @@ async function handleReject(ws: CollabSocket, studentId: unknown) {
|
||||
const [teacher] = await db
|
||||
.select({ adminType: schema.user.adminType })
|
||||
.from(schema.user)
|
||||
.where(and(eq(schema.user.id, ws.data.userId), eq(schema.user.isDisabled, false)))
|
||||
.where(
|
||||
and(
|
||||
eq(schema.user.id, ws.data.userId),
|
||||
eq(schema.user.isDisabled, false),
|
||||
),
|
||||
)
|
||||
.limit(1)
|
||||
if (!teacher || !TEACHER_ROLES.includes(toAdminType(teacher.adminType))) {
|
||||
ws.close(1008, "Permission revoked")
|
||||
@@ -461,7 +482,10 @@ function teardownRoom(
|
||||
* 「服务端不知道代码内容」是有意的:这个通道要做的事只有认证和分房间,
|
||||
* 权限由 accept 时的库查询决定,与帧里装的是什么无关。
|
||||
*/
|
||||
export function handleCollabBinary(ws: CollabSocket, data: Buffer | Uint8Array) {
|
||||
export function handleCollabBinary(
|
||||
ws: CollabSocket,
|
||||
data: Buffer | Uint8Array,
|
||||
) {
|
||||
// 空帧:Bun.serve 探测过,send() 对 0 字节帧也回 0(同一个返回值,
|
||||
// 真实送达和真实丢弃分不清),不转发、不参与下面的失败判定,直接忽略。
|
||||
// 否则任何一方发一个 0 字节二进制帧就能把整间房拆掉
|
||||
@@ -469,7 +493,8 @@ export function handleCollabBinary(ws: CollabSocket, data: Buffer | Uint8Array)
|
||||
|
||||
const room = roomOf(ws)
|
||||
if (!room) return
|
||||
const peer = ws === room.teacherSocket ? room.studentSocket : room.teacherSocket
|
||||
const peer =
|
||||
ws === room.teacherSocket ? room.studentSocket : room.teacherSocket
|
||||
const sent = peer.send(data)
|
||||
// Bun.serve 探测过:-1 不代表失败,是背压——消息已排队,最终会送达(实测 8MB
|
||||
// 帧照样完整到达);只有 0 才是真的丢了(对端事实上已经断开)。之前把 <= 0
|
||||
|
||||
@@ -6,7 +6,9 @@
|
||||
* 所以内存态够用,不需要 Redis 同步。进程重启丢掉全部状态,两端重连后回到干净状态。
|
||||
*/
|
||||
|
||||
export type CollabSocket = Bun.ServerWebSocket<import("../websocket").SubmissionSocketData>
|
||||
export type CollabSocket = Bun.ServerWebSocket<
|
||||
import("../websocket").SubmissionSocketData
|
||||
>
|
||||
|
||||
/**
|
||||
* 协作支持的语言。和前端 utils/types.ts 里的 LANGUAGE 对齐,去掉 Flowchart ——
|
||||
@@ -69,7 +71,6 @@ export function removeRequest(studentId: number) {
|
||||
return requests.delete(studentId)
|
||||
}
|
||||
|
||||
|
||||
/** 按发起时间正序。老师端按等待时长排序展示,不强制先来先到 */
|
||||
export function listRequests() {
|
||||
return Array.from(requests.values()).sort((a, b) => a.createdAt - b.createdAt)
|
||||
@@ -81,7 +82,8 @@ export function queueAheadOf(studentId: number) {
|
||||
if (!self) return 0
|
||||
let ahead = 0
|
||||
for (const request of requests.values()) {
|
||||
if (request.status === "pending" && request.createdAt < self.createdAt) ahead += 1
|
||||
if (request.status === "pending" && request.createdAt < self.createdAt)
|
||||
ahead += 1
|
||||
}
|
||||
return ahead
|
||||
}
|
||||
@@ -132,4 +134,3 @@ export function roomOf(ws: CollabSocket) {
|
||||
const ownerId = ws.data.roomOwnerId
|
||||
return ownerId === undefined ? undefined : rooms.get(ownerId)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user