zikai
9af28f41b4
死代码移除: - whiteboard_hub.py: 移除未引用的 reset_hub 单例重置函数 - tunnel_service.py: 移除未引用的 is_port_allowed (逻辑已在 sftp_server 内联) - tunnel_session_dao.py: 移除未引用的 get_active_by_port - pdf_job_dao.py: 移除未用 datetime 导入 - pdf_converter.py: 移除未用 shutil 导入 - pdf_service.py: 移除未用 PdfSubmitResponse 导入 + _do_convert 内未用 hashlib 导入 - upload_html.py: 移除未用 escape 导入 (JS 侧自有 escapeHtml) - pdf_controller.py: 移除 _resolve_cookie 内未用 cfg 局部变量 提前失败/分层修复: - database.py init_db_schema: 建表后用 inspector 校验既有表列与模型一致, 缺列即抛 RuntimeError (fail-fast on schema drift), 避免运行期才暴露 - whiteboard_dao.get_or_create: 仅 IntegrityError 才回滚重读, 其他异常向上抛 (原 except Exception 会掩盖 schema/连接等真实故障) - pdf_service.admin_delete/_safe_delete_file: 改用 PdfJobDAO.delete / UploadedFileDAO.delete, 不再直接操作 job_dao.db / file_dao.db (修复分层契约: DAO 头注释声明 service 不直接操作 session) - PdfJobDAO 新增 delete(job) 方法 日志补全 (8 处 silent catch): - whiteboard_hub.py disconnect/close_board 关闭 ws: logger.debug - whiteboard_controller _safe_send/_safe_close: logger.debug - sftp_server _close_tunnel_dao/读用户名: logger.debug - sftp_server validate_public_key: logger.warning (auth 路径, 避免静默失败) 文档: - 新增 docs/routes.md, docs/configuration.md, docs/error-handling.md - README.md 精简为简介/结构/外部依赖/apache2 配置/Ubuntu 安装/docs 链接
55 lines
1.7 KiB
Python
55 lines
1.7 KiB
Python
"""TunnelSession 的 DAO。"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from datetime import datetime
|
|
|
|
from sqlalchemy import select, update
|
|
from sqlalchemy.orm import Session
|
|
|
|
from ..models.tunnel_session import TunnelSession
|
|
|
|
|
|
class TunnelSessionDAO:
|
|
def __init__(self, db: Session) -> None:
|
|
self.db = db
|
|
|
|
def create(self, session: TunnelSession) -> TunnelSession:
|
|
self.db.add(session)
|
|
self.db.commit()
|
|
self.db.refresh(session)
|
|
return session
|
|
|
|
def get_active_by_user(self, user_name: str) -> TunnelSession | None:
|
|
"""返回该 user 当前活跃的隧道会话(至多一条)。"""
|
|
stmt = (
|
|
select(TunnelSession)
|
|
.where(TunnelSession.user_name == user_name)
|
|
.where(TunnelSession.status == "active")
|
|
.order_by(TunnelSession.started_at.desc())
|
|
.limit(1)
|
|
)
|
|
return self.db.scalars(stmt).first()
|
|
|
|
def list_active(self) -> list[TunnelSession]:
|
|
stmt = select(TunnelSession).where(TunnelSession.status == "active")
|
|
return list(self.db.scalars(stmt).all())
|
|
|
|
def close(self, session: TunnelSession) -> None:
|
|
"""标记会话结束。"""
|
|
session.ended_at = datetime.now()
|
|
session.status = "closed"
|
|
self.db.commit()
|
|
|
|
def close_active_by_user(self, user_name: str) -> int:
|
|
"""关闭该 user 所有 active 会话(断开清理用),返回关闭条数。"""
|
|
stmt = (
|
|
update(TunnelSession)
|
|
.where(TunnelSession.user_name == user_name)
|
|
.where(TunnelSession.status == "active")
|
|
.values(status="closed", ended_at=datetime.now())
|
|
)
|
|
result = self.db.execute(stmt)
|
|
self.db.commit()
|
|
return result.rowcount or 0
|