feat: 文件浏览页 + 共享白板 + 白板管理页（含补登记分片上传/隧道历史改动）
本次提交包含两批改动（7月2日遗留未入库 + 本次新功能），分述如下：
【补登记：7月2日已上线但未提交的功能】
- 分片上传：chunk_upload_controller/service/dao + UploadSession model/schema，
支持 4MiB 分片、乱序、断点续传、去重、幂等 complete；后台 reaper 清理过期会话。
- 反向隧道：tunnel_controller/service/dao + TunnelSession model/schema，
SSH remote forward 经 /api/userPort/{userName} 反代到 user 本地服务。
- 上传页：views/upload_html.py（拖拽/多文件/分片/断点续传 UI）。
- config.py：StorageConfig.chunk_session_dir/ttl、TunnelConfig；
requirements.txt 加 httpx；start.sh 清理 .work/ 残留；
schema.sql 加 upload_session/tunnel_session 表；sftp_server 承载隧道转发。
【本次新功能】
- 文件浏览页：GET /files（Basic Auth 同 docs）+ /api/admin/files（list/get/download/DELETE）。
硬删除（DB 行 + 磁盘文件），删除后列表不再显示。前端 static/file_browser.*。
- 共享白板：GET /whiteboard/{id}（公开，不存在则新建）+ WS /ws/whiteboard/{id}。
MySQL 持久化（whiteboard 表），Canvas 实时同步，心跳 3s/5 次失活移除，
清空/复制按钮，移动端兼容。WhiteboardHub 管理 {board_id: set[Connection]}，
disconnect 幂等 + 空 set 清理防泄漏，broadcast 失败连接自动移除。
- 白板管理页：GET /whiteboard-admin（Basic Auth）+ /api/admin/whiteboards（list/DELETE）。
删除时 hub.close_board 踢出在线连接。
- 清理：合并 UploadService.get_out_with_disk_path（下载/删除复用，消除重复 DB 读），
移除无用 resolve_disk_path。
- config.py：WhiteboardConfig（heartbeat/threshold/board_id 长度/list_limit）；
schema.sql 加 whiteboard 表；README 补新接口与心跳/内存说明。
- 验证：tests/manual_whiteboard_hub.py / _ws.py / _kick.py 全部通过。
This commit is contained in:
zikai
130
tests/manual_whiteboard_hub.py
Normal file
130
tests/manual_whiteboard_hub.py
Normal file
@@ -0,0 +1,130 @@
|
||||
"""白板 hub 内存与心跳验证脚本（手动烟测，非 pytest）。
|
||||
|
||||
验证点：
|
||||
1. 连接接入 -> hub._boards 出现该 board 的 set
|
||||
2. disconnect -> 连接从 set 移除，空 set 从 dict 删除（无内存泄漏）
|
||||
3. 心跳失活：reaper 扫描超过 timeout 的连接并移除
|
||||
4. 删除白板 -> close_board 踢出该 board 所有连接并清理 dict
|
||||
5. broadcast 对失败连接自动 disconnect
|
||||
|
||||
用伪造的 WebSocket 对象（不依赖真实网络）跑，直接断言 hub 内部状态。
|
||||
运行：.venv/bin/python tests/manual_whiteboard_hub.py
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import asyncio
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parent.parent
|
||||
sys.path.insert(0, str(ROOT))
|
||||
|
||||
from app.services.whiteboard_hub import Connection, WhiteboardHub # noqa: E402
|
||||
|
||||
|
||||
class FakeWS:
|
||||
"""最小化的 WebSocket 替身：记录发送/关闭，receive 永不返回。"""
|
||||
|
||||
def __init__(self) -> None:
|
||||
self.sent: list[dict] = []
|
||||
self.closed = False
|
||||
self._fail_send = False
|
||||
|
||||
async def accept(self) -> None:
|
||||
pass
|
||||
|
||||
async def send_json(self, msg: dict) -> None:
|
||||
if self._fail_send:
|
||||
raise RuntimeError("send failed (simulated)")
|
||||
self.sent.append(msg)
|
||||
|
||||
async def close(self) -> None:
|
||||
self.closed = True
|
||||
|
||||
|
||||
async def main() -> None:
|
||||
# 用一个独立 hub 实例，避免污染全局单例；构造时读 config 默认 3s*5=15s
|
||||
hub = WhiteboardHub()
|
||||
print(f"timeout_seconds = {hub.timeout_seconds} (期望 15)")
|
||||
assert hub.timeout_seconds == 15, "心跳超时应为 3*5=15s"
|
||||
|
||||
# ---- 1. 接入 ----
|
||||
ws1 = FakeWS()
|
||||
c1 = Connection(websocket=ws1, board_id="b1", client_id="c1")
|
||||
await hub.register(c1)
|
||||
assert "b1" in hub._boards, "接入后 b1 应存在"
|
||||
assert hub.connection_count("b1") == 1
|
||||
print("1. 接入 OK")
|
||||
|
||||
# ---- 2. disconnect 清理空 set ----
|
||||
ws2 = FakeWS()
|
||||
c2 = Connection(websocket=ws2, board_id="b1", client_id="c2")
|
||||
await hub.register(c2)
|
||||
assert hub.connection_count("b1") == 2
|
||||
await hub.disconnect(c2)
|
||||
assert hub.connection_count("b1") == 1, "c2 移除后应剩 1"
|
||||
assert ws2.closed, "c2 的 ws 应被关闭"
|
||||
await hub.disconnect(c1)
|
||||
assert "b1" not in hub._boards, "空 set 应从 dict 删除（防泄漏）"
|
||||
print("2. disconnect 清理空 set OK")
|
||||
|
||||
# ---- 3. 心跳失活 reaper ----
|
||||
# 手动把 last_heartbeat 调到很久以前，触发 reaper 移除
|
||||
ws3 = FakeWS()
|
||||
c3 = Connection(websocket=ws3, board_id="b2", client_id="c3")
|
||||
# 模拟 30s 前心跳
|
||||
c3.last_heartbeat = asyncio.get_event_loop().time() - 30
|
||||
await hub.register(c3)
|
||||
assert hub.connection_count("b2") == 1
|
||||
await hub._reap_once()
|
||||
assert hub.connection_count("b2") == 0, "失活连接应被 reaper 移除"
|
||||
assert ws3.closed, "失活连接的 ws 应被关闭"
|
||||
assert "b2" not in hub._boards, "移除后空 set 应清理"
|
||||
print("3. 心跳失活 reaper OK")
|
||||
|
||||
# ---- 4. 心跳未超时的连接不被移除 ----
|
||||
ws4 = FakeWS()
|
||||
c4 = Connection(websocket=ws4, board_id="b3", client_id="c4")
|
||||
await hub.register(c4)
|
||||
await hub._reap_once()
|
||||
assert hub.connection_count("b3") == 1, "正常心跳连接不应被移除"
|
||||
print("4. 正常连接保留 OK")
|
||||
|
||||
# ---- 5. close_board 踢出所有连接 ----
|
||||
ws5 = FakeWS()
|
||||
c5 = Connection(websocket=ws5, board_id="b3", client_id="c5")
|
||||
await hub.register(c5)
|
||||
assert hub.connection_count("b3") == 2
|
||||
await hub.close_board("b3")
|
||||
assert hub.connection_count("b3") == 0, "close_board 后连接应清空"
|
||||
assert ws4.closed and ws5.closed, "该 board 所有 ws 应被关闭"
|
||||
assert "b3" not in hub._boards, "close_board 后 dict 应清理"
|
||||
assert any(m.get("type") == "error" for m in ws4.sent), "应先发 error 通知"
|
||||
print("5. close_board 踢出连接 OK")
|
||||
|
||||
# ---- 6. broadcast 排除发送者 + 失败连接自动清理 ----
|
||||
wsA = FakeWS()
|
||||
wsB = FakeWS()
|
||||
wsB._fail_send = True # 模拟 B 发送失败
|
||||
cA = Connection(websocket=wsA, board_id="b4", client_id="A")
|
||||
cB = Connection(websocket=wsB, board_id="b4", client_id="B")
|
||||
await hub.register(cA)
|
||||
await hub.register(cB)
|
||||
await hub.broadcast("b4", {"type": "stroke"}, exclude=cA)
|
||||
assert not wsA.sent, "排除发送者：A 不应收到"
|
||||
assert wsB.closed, "发送失败的 B 应被自动 disconnect"
|
||||
assert hub.connection_count("b4") == 1, "B 移除后应剩 A"
|
||||
print("6. broadcast 排除 + 失败自动清理 OK")
|
||||
|
||||
# ---- 7. 幂等 disconnect ----
|
||||
await hub.disconnect(cA)
|
||||
await hub.disconnect(cA) # 重复调用不应报错
|
||||
assert "b4" not in hub._boards
|
||||
print("7. 幂等 disconnect OK")
|
||||
|
||||
print("\n全部通过 ✅")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
asyncio.run(main())
|
||||
52
tests/manual_whiteboard_kick.py
Normal file
52
tests/manual_whiteboard_kick.py
Normal file
@@ -0,0 +1,52 @@
|
||||
"""验证删除白板时，在线 WS 连接被服务端踢出（收到 error 帧并断连）。"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import asyncio
|
||||
import json
|
||||
import urllib.request
|
||||
|
||||
import websockets
|
||||
|
||||
BASE_WS = "ws://127.0.0.1:6890/ws/whiteboard"
|
||||
BOARD = "kicktest"
|
||||
AUTH = "Basic YTo2NjUxMTMxNQ==" # a:66511315
|
||||
|
||||
|
||||
async def main() -> None:
|
||||
async with websockets.connect(f"{BASE_WS}/{BOARD}") as a:
|
||||
await a.send(json.dumps({"type": "hello", "client_id": "A"}))
|
||||
init = json.loads(await asyncio.wait_for(a.recv(), timeout=2))
|
||||
assert init["type"] == "init"
|
||||
print("A connected, init received")
|
||||
|
||||
# 通过 REST 删除白板（带 Basic Auth）
|
||||
req = urllib.request.Request(
|
||||
f"http://127.0.0.1:6890/api/admin/whiteboards/{BOARD}",
|
||||
method="DELETE",
|
||||
headers={"Authorization": AUTH},
|
||||
)
|
||||
with urllib.request.urlopen(req) as r:
|
||||
print("delete response:", r.read().decode())
|
||||
|
||||
# A 应收到 error 帧随后连接关闭
|
||||
try:
|
||||
raw = await asyncio.wait_for(a.recv(), timeout=3)
|
||||
msg = json.loads(raw)
|
||||
print("A received:", msg)
|
||||
assert msg["type"] == "error", "应收到 error 通知"
|
||||
except (websockets.ConnectionClosed, asyncio.TimeoutError) as e:
|
||||
print("连接关闭/超时:", e)
|
||||
|
||||
# 确认连接已断
|
||||
try:
|
||||
await asyncio.wait_for(a.recv(), timeout=2)
|
||||
print("ERROR: 连接仍存活（应已断开）")
|
||||
except websockets.ConnectionClosed:
|
||||
print("连接已被服务端关闭 ✅")
|
||||
except asyncio.TimeoutError:
|
||||
print("连接未关闭但无消息（部分通过）")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
asyncio.run(main())
|
||||
92
tests/manual_whiteboard_ws.py
Normal file
92
tests/manual_whiteboard_ws.py
Normal file
@@ -0,0 +1,92 @@
|
||||
"""白板 WebSocket 端到端烟测：两客户端实时同步 + 心跳 + 清空。
|
||||
|
||||
验证：
|
||||
1. 客户端 A 连入 -> 收到 init
|
||||
2. 客户端 B 连入 -> 收到 init
|
||||
3. A 画一笔 -> B 收到 stroke 广播（A 不收自己的）
|
||||
4. 心跳 ping -> pong
|
||||
5. A 清空 -> A、B 都收到 cleared
|
||||
6. 停发心跳的连接会被服务端 reaper 移除（15s，这里只验证 ping/pong 即可，reaper 已在 hub 单测覆盖）
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import asyncio
|
||||
import json
|
||||
|
||||
import websockets
|
||||
|
||||
BASE_WS = "ws://127.0.0.1:6890/ws/whiteboard"
|
||||
BOARD = "e2etest"
|
||||
|
||||
|
||||
async def recv_msg(ws, timeout=2.0) -> dict | None:
|
||||
try:
|
||||
raw = await asyncio.wait_for(ws.recv(), timeout=timeout)
|
||||
return json.loads(raw)
|
||||
except asyncio.TimeoutError:
|
||||
return None
|
||||
|
||||
|
||||
async def main() -> None:
|
||||
async with websockets.connect(f"{BASE_WS}/{BOARD}") as a, \
|
||||
websockets.connect(f"{BASE_WS}/{BOARD}") as b:
|
||||
# hello
|
||||
await a.send(json.dumps({"type": "hello", "client_id": "A"}))
|
||||
await b.send(json.dumps({"type": "hello", "client_id": "B"}))
|
||||
|
||||
init_a = await recv_msg(a)
|
||||
init_b = await recv_msg(b)
|
||||
print("A init:", init_a.get("type") if init_a else None)
|
||||
print("B init:", init_b.get("type") if init_b else None)
|
||||
assert init_a and init_a["type"] == "init"
|
||||
assert init_b and init_b["type"] == "init"
|
||||
|
||||
# A 画一笔
|
||||
stroke = {"points": [[10, 10], [20, 20]], "color": "#1565c0", "width": 3}
|
||||
await a.send(json.dumps({"type": "stroke", "stroke": stroke}))
|
||||
# A 不应收到自己的（排除发送者）
|
||||
echo = await recv_msg(a, timeout=1.0)
|
||||
print("A self-echo (expect None):", echo)
|
||||
assert echo is None, "发送者不应收到自己的 stroke"
|
||||
# B 应收到
|
||||
got = await recv_msg(b)
|
||||
print("B recv:", got.get("type") if got else None, "client_id=", got.get("client_id") if got else None)
|
||||
assert got and got["type"] == "stroke" and got["client_id"] == "A"
|
||||
assert got["stroke"] == stroke
|
||||
|
||||
# 心跳
|
||||
await a.send(json.dumps({"type": "ping"}))
|
||||
pong = await recv_msg(a)
|
||||
print("A pong:", pong.get("type") if pong else None)
|
||||
assert pong and pong["type"] == "pong"
|
||||
|
||||
# 清空 -> 两端都收 cleared
|
||||
await b.send(json.dumps({"type": "clear"}))
|
||||
cleared_b = await recv_msg(b)
|
||||
cleared_a = await recv_msg(a)
|
||||
print("B cleared:", cleared_b.get("type") if cleared_b else None,
|
||||
"A cleared:", cleared_a.get("type") if cleared_a else None)
|
||||
assert cleared_b and cleared_b["type"] == "cleared" and cleared_b["client_id"] == "B"
|
||||
assert cleared_a and cleared_a["type"] == "cleared" and cleared_a["client_id"] == "B"
|
||||
|
||||
# 验证持久化：重连后 init 应 strokes 为空（已清空）
|
||||
async with websockets.connect(f"{BASE_WS}/{BOARD}") as c:
|
||||
await c.send(json.dumps({"type": "hello", "client_id": "C"}))
|
||||
init_c = await recv_msg(c)
|
||||
print("C init after clear, strokes=", init_c.get("strokes") if init_c else None)
|
||||
assert init_c and init_c["type"] == "init"
|
||||
assert init_c["strokes"] == [], "清空后重连应得到空 strokes"
|
||||
|
||||
# 验证 stroke_count 累计（之前 1 笔 + 1 次清空 = 2）
|
||||
import urllib.request
|
||||
with urllib.request.urlopen(f"http://127.0.0.1:6890/whiteboard/{BOARD}") as r:
|
||||
meta = json.load(r)
|
||||
print("stroke_count after ops:", meta["stroke_count"])
|
||||
assert meta["stroke_count"] == 2, "1 笔 + 1 清空 = 2 次修改"
|
||||
|
||||
print("\nWS 端到端全部通过 ✅")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
asyncio.run(main())
|
||||
Reference in New Issue
Block a user