From 6fba03ea4a68155630af2dee11b8db9015e37568 Mon Sep 17 00:00:00 2001 From: CakeCN Date: Thu, 8 Jan 2026 00:22:24 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=9F=BA=E4=BA=8Eroom=E7=9A=84=E5=A4=9A?= =?UTF-8?q?=E7=A7=9F=E6=88=B7WebSocket=E8=BF=9E=E6=8E=A5=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/sockets/terminal_service.py | 91 +++++++++++-------- 1 file changed, 51 insertions(+), 40 deletions(-) diff --git a/code-server-like/app/sockets/terminal_service.py b/code-server-like/app/sockets/terminal_service.py index a9b2749..b2177e9 100644 --- a/code-server-like/app/sockets/terminal_service.py +++ b/code-server-like/app/sockets/terminal_service.py @@ -125,27 +125,24 @@ def read_and_forward_pty_output(fd=None, pid=None, room_id=None, namespace=None) class VSCLikeNameSpace(Namespace): def on_connect(self): """new client connected""" - # 确保terminal_config存在于session中 - if 'terminal_config' not in session: - session['terminal_config'] = TERM_INIT_CONFIG.copy() - session.modified = True + # 为每个客户端生成唯一的会话ID和房间ID + session_id = str(uuid.uuid4()) + room_id = f"terminal_{session_id}" - terminal_config = session['terminal_config'] + # 加入房间 + join_room(room_id) + + # 确保terminal_config存在于session中，每个客户端有独立配置 + terminal_config = { + **TERM_INIT_CONFIG.copy(), + 'session_id': session_id, + 'room_id': room_id + } + session['terminal_config'] = terminal_config + session.modified = True + + current_app.logger.debug(f"Client connected, session_id: {session_id}, room_id: {room_id}") - # 检查是否已经有运行中的子进程 - if terminal_config.get('child_pid'): - try: - # 验证进程是否真的存在 - child_process = psutil.Process(terminal_config['child_pid']) - if child_process.status() in ('running', 'sleeping'): - current_app.logger.debug("Already running child process: {}".format(terminal_config['child_pid'])) - return - except psutil.NoSuchProcess: - # 进程不存在，清理配置 - terminal_config.pop('child_pid', None) - terminal_config.pop('fd', None) - session.modified = True - # create child process attached to a pty we can read from and write to (child_pid, fd) = pty.fork() lesson_path = session.get('path') @@ -155,7 +152,6 @@ class VSCLikeNameSpace(Namespace): # of this subprocess try: # 获取终端配置 - terminal_config = session.get('terminal_config', {}) term_type = terminal_config.get('term_type') if not term_type: @@ -164,7 +160,7 @@ class VSCLikeNameSpace(Namespace): path = TERM_INIT_CONFIG.get('client_path', {}).get(term_type, None) if not path or not os.path.exists(path): - print("Can't locate {} binary at {}, exit".format(term_type, path)) + print(f"Can't locate {term_type} binary at {path}, exit") os._exit(1) # 获取连接参数 @@ -185,29 +181,29 @@ class VSCLikeNameSpace(Namespace): elif term_type == 'ssh': # 使用ssh连接 ssh_port = port if port else 22 # 默认端口22 - os.execl(path, 'ssh', '-p', str(ssh_port), '{}@{}'.format(username, domain)) + os.execl(path, 'ssh', '-p', str(ssh_port), f'{username}@{domain}') else: - print("Wrong term type {}, exit".format(term_type)) + print(f"Wrong term type {term_type}, exit") os._exit(1) except Exception as e: - print("Error in child process: {}", str(e)) + print(f"Error in child process: {e}") os._exit(1) else: - # 更新会话配置 + # 更新会话配置，保存到session中 terminal_config['fd'] = fd terminal_config['child_pid'] = child_pid - terminal_config['room_id'] = rooms()[0] + session['terminal_config'] = terminal_config session.modified = True # 设置初始窗口大小 set_winsize(fd, 50, 50) # 记录日志 - current_app.logger.debug("child pid = {}".format(child_pid)) - current_app.logger.debug("rooms of this session = {}".format(rooms())) + current_app.logger.debug(f"Child process created: {child_pid} for room: {room_id}") + current_app.logger.debug(f"Client joined room: {room_id}") - # 启动后台任务读取pty输出 - socketio.start_background_task(read_and_forward_pty_output, fd, child_pid, rooms()[0], self) + # 启动后台任务读取pty输出，传入正确的room_id + socketio.start_background_task(read_and_forward_pty_output, fd, child_pid, room_id, self) current_app.logger.debug("background task running") def on_pty_input(self, data): @@ -323,13 +319,23 @@ class VSCLikeNameSpace(Namespace): terminal_config = session.get('terminal_config', {}) child_pid = terminal_config.get('child_pid') fd = terminal_config.get('fd') + room_id = terminal_config.get('room_id') + session_id = terminal_config.get('session_id') + + current_app.logger.debug(f"Client disconnecting, session_id: {session_id}, room_id: {room_id}") + + # 退出房间 + if room_id: + leave_room(room_id) + current_app.logger.debug(f"Client left room: {room_id}") # 先关闭文件描述符，避免其他操作尝试使用无效的文件描述符 if fd: try: os.close(fd) - except Exception: - pass + current_app.logger.debug(f"Closed file descriptor: {fd}") + except Exception as e: + current_app.logger.debug(f"Error closing file descriptor: {e}") if child_pid: try: @@ -340,23 +346,28 @@ class VSCLikeNameSpace(Namespace): child_process.terminate() # Wait for the process to terminate and collect its exit status child_process.wait(timeout=2) - current_app.logger.debug('user left the pty alone, terminated and waited') - except psutil.NoSuchProcess as err: + current_app.logger.debug(f'User left pty alone, terminated and waited: {child_pid}') + except psutil.NoSuchProcess: # Process already terminated, try to wait anyway to clean up any zombie try: os.waitpid(child_pid, os.WNOHANG) - except Exception: - pass + current_app.logger.debug(f'Cleaned up zombie process: {child_pid}') + except Exception as e: + current_app.logger.debug(f"Error cleaning up zombie process: {e}") except psutil.TimeoutExpired: # If process didn't terminate in time, kill it forcefully try: child_process.kill() child_process.wait(timeout=1) - except Exception: - pass + current_app.logger.debug(f'Forcefully killed process: {child_pid}') + except Exception as e: + current_app.logger.debug(f"Error forcefully killing process: {e}") except Exception as err: current_app.logger.error(f'Error terminating process: {err}') - # Reset session config - session['terminal_config'] = TERM_INIT_CONFIG + # Clear session config for this client + session.pop('terminal_config', None) + session.modified = True + + current_app.logger.debug(f"Client disconnected, session_id: {session_id}, room_id: {room_id}") current_app.logger.debug('Client disconnected') \ No newline at end of file From eba1e8052ce81cdd85b6ab8aa16f9fd3ecd17aee Mon Sep 17 00:00:00 2001 From: CakeCN Date: Thu, 8 Jan 2026 00:28:39 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E4=BA=86=20create=5Fterm?= =?UTF-8?q?inal=20=E6=96=B9=E6=B3=95=EF=BC=9B=E6=B2=A1=E6=9C=89=E5=AD=90?= =?UTF-8?q?=E8=BF=9B=E7=A8=8B=E6=97=B6=EF=BC=8C=E8=87=AA=E5=8A=A8=E8=B0=83?= =?UTF-8?q?=E7=94=A8=20create=5Fterminal=20=E9=87=8D=E6=96=B0=E5=88=9B?= =?UTF-8?q?=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/sockets/terminal_service.py | 170 +++++++++++------- 1 file changed, 110 insertions(+), 60 deletions(-) diff --git a/code-server-like/app/sockets/terminal_service.py b/code-server-like/app/sockets/terminal_service.py index b2177e9..c13a2a1 100644 --- a/code-server-like/app/sockets/terminal_service.py +++ b/code-server-like/app/sockets/terminal_service.py @@ -123,25 +123,24 @@ def read_and_forward_pty_output(fd=None, pid=None, room_id=None, namespace=None) pass class VSCLikeNameSpace(Namespace): - def on_connect(self): - """new client connected""" - # 为每个客户端生成唯一的会话ID和房间ID - session_id = str(uuid.uuid4()) - room_id = f"terminal_{session_id}" + def create_terminal(self): + """创建新的终端并更新session配置""" + terminal_config = session.get('terminal_config', {}) - # 加入房间 - join_room(room_id) + # 如果没有房间ID，创建一个新的 + if not terminal_config.get('room_id'): + session_id = str(uuid.uuid4()) + room_id = f"terminal_{session_id}" + join_room(room_id) + terminal_config.update({ + **TERM_INIT_CONFIG.copy(), + 'session_id': session_id, + 'room_id': room_id + }) + else: + room_id = terminal_config['room_id'] - # 确保terminal_config存在于session中，每个客户端有独立配置 - terminal_config = { - **TERM_INIT_CONFIG.copy(), - 'session_id': session_id, - 'room_id': room_id - } - session['terminal_config'] = terminal_config - session.modified = True - - current_app.logger.debug(f"Client connected, session_id: {session_id}, room_id: {room_id}") + current_app.logger.debug(f"Creating new terminal for room: {room_id}") # create child process attached to a pty we can read from and write to (child_pid, fd) = pty.fork() @@ -200,11 +199,36 @@ class VSCLikeNameSpace(Namespace): # 记录日志 current_app.logger.debug(f"Child process created: {child_pid} for room: {room_id}") - current_app.logger.debug(f"Client joined room: {room_id}") # 启动后台任务读取pty输出，传入正确的room_id socketio.start_background_task(read_and_forward_pty_output, fd, child_pid, room_id, self) - current_app.logger.debug("background task running") + current_app.logger.debug("Background task running") + + return terminal_config + + def on_connect(self): + """new client connected""" + # 为每个客户端生成唯一的会话ID和房间ID + session_id = str(uuid.uuid4()) + room_id = f"terminal_{session_id}" + + # 加入房间 + join_room(room_id) + + # 确保terminal_config存在于session中，每个客户端有独立配置 + terminal_config = { + **TERM_INIT_CONFIG.copy(), + 'session_id': session_id, + 'room_id': room_id + } + session['terminal_config'] = terminal_config + session.modified = True + + current_app.logger.debug(f"Client connected, session_id: {session_id}, room_id: {room_id}") + + # 创建终端 + self.create_terminal() + current_app.logger.debug("background task running") def on_pty_input(self, data): """write to the child pty, which now is the ssh process from this machine to the 'domain' configured @@ -227,36 +251,50 @@ class VSCLikeNameSpace(Namespace): try: terminal_config = session.get('terminal_config', {}) child_pid = terminal_config.get('child_pid') + + # 如果没有子进程，重新创建终端 if not child_pid: - current_app.logger.error("No child process found") - return + current_app.logger.debug("No child process found, creating new terminal") + terminal_config = self.create_terminal() + child_pid = terminal_config.get('child_pid') + if not child_pid: + current_app.logger.error("Failed to create new terminal") + return - child_process = psutil.Process(child_pid) - if child_process.status() not in ('running', 'sleeping'): - current_app.logger.debug("Child process not running, cleaning up") - terminal_config.pop('child_pid', None) - terminal_config.pop('fd', None) - session.modified = True - return + # 检查子进程是否存在且运行中 + try: + child_process = psutil.Process(child_pid) + if child_process.status() not in ('running', 'sleeping'): + current_app.logger.debug("Child process not running, creating new terminal") + terminal_config = self.create_terminal() + child_pid = terminal_config.get('child_pid') + if not child_pid: + current_app.logger.error("Failed to create new terminal") + return + except psutil.NoSuchProcess: + current_app.logger.debug("Child process not found, creating new terminal") + terminal_config = self.create_terminal() + child_pid = terminal_config.get('child_pid') + if not child_pid: + current_app.logger.error("Failed to create new terminal") + return + # 获取文件描述符并写入数据 fd = terminal_config.get('fd') if fd: try: os.write(fd, input_data.encode()) except (OSError, IOError) as e: - # File descriptor closed or invalid, clean up - current_app.logger.debug(f"Error writing to file descriptor: {e}") - terminal_config.pop('child_pid', None) - terminal_config.pop('fd', None) - session.modified = True - except psutil.NoSuchProcess: - # Process no longer exists, clean up - terminal_config = session.get('terminal_config', {}) - terminal_config.pop('child_pid', None) - terminal_config.pop('fd', None) - session.modified = True + # File descriptor closed or invalid, create new terminal + current_app.logger.debug(f"Error writing to file descriptor: {e}, creating new terminal") + terminal_config = self.create_terminal() except Exception as e: current_app.logger.error(f"Error in pty_input handling: {e}") + # 发生异常时尝试重新创建终端 + try: + self.create_terminal() + except Exception as create_err: + current_app.logger.error(f"Failed to recreate terminal: {create_err}") def on_resize(self, data): @@ -281,39 +319,51 @@ class VSCLikeNameSpace(Namespace): try: terminal_config = session.get('terminal_config', {}) child_pid = terminal_config.get('child_pid') + + # 如果没有子进程，重新创建终端 if not child_pid: - current_app.logger.error("No child process found for resize") - return + current_app.logger.debug("No child process found for resize, creating new terminal") + terminal_config = self.create_terminal() + child_pid = terminal_config.get('child_pid') + if not child_pid: + current_app.logger.error("Failed to create new terminal for resize") + return # 检查子进程是否存在且运行中 - child_process = psutil.Process(child_pid) - if child_process.status() not in ('running', 'sleeping'): - current_app.logger.debug("Child process not running, cleaning up resize") - terminal_config.pop('child_pid', None) - terminal_config.pop('fd', None) - session.modified = True - return + try: + child_process = psutil.Process(child_pid) + if child_process.status() not in ('running', 'sleeping'): + current_app.logger.debug("Child process not running for resize, creating new terminal") + terminal_config = self.create_terminal() + child_pid = terminal_config.get('child_pid') + if not child_pid: + current_app.logger.error("Failed to create new terminal for resize") + return + except psutil.NoSuchProcess: + current_app.logger.debug("Child process not found for resize, creating new terminal") + terminal_config = self.create_terminal() + child_pid = terminal_config.get('child_pid') + if not child_pid: + current_app.logger.error("Failed to create new terminal for resize") + return + # 获取文件描述符并调整窗口大小 fd = terminal_config.get('fd') if fd: - # 检查文件描述符是否有效 try: os.fstat(fd) set_winsize(fd, rows, cols) except (OSError, IOError) as e: - # 文件描述符无效，清理资源 - current_app.logger.debug(f"Error resizing terminal: {e}") - terminal_config.pop('child_pid', None) - terminal_config.pop('fd', None) - session.modified = True - except psutil.NoSuchProcess: - # 进程不存在，清理资源 - terminal_config = session.get('terminal_config', {}) - terminal_config.pop('child_pid', None) - terminal_config.pop('fd', None) - session.modified = True + # 文件描述符无效，创建新终端 + current_app.logger.debug(f"Error resizing terminal: {e}, creating new terminal") + terminal_config = self.create_terminal() except Exception as e: current_app.logger.error(f"Error in resize handling: {e}") + # 发生异常时尝试重新创建终端 + try: + self.create_terminal() + except Exception as create_err: + current_app.logger.error(f"Failed to recreate terminal for resize: {create_err}") def on_disconnect(self): terminal_config = session.get('terminal_config', {}) From 2e1139d1018e3a7d4ba5569bdd71f36ea0ada4f1 Mon Sep 17 00:00:00 2001 From: CakeCN Date: Thu, 8 Jan 2026 00:31:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=98=B2=E6=AD=A2=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=99=A8=E5=AE=95=E6=9C=BA=20=EF=BC=9A=20Socket=20operation=20?= =?UTF-8?q?on=20non-socket=20=E9=94=99=E8=AF=AF=E4=B8=8D=E4=BC=9A=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=B4=A9=E6=BA=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code-server-like/app/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code-server-like/app/__init__.py b/code-server-like/app/__init__.py index 91d797d..f7a1280 100644 --- a/code-server-like/app/__init__.py +++ b/code-server-like/app/__init__.py @@ -48,8 +48,9 @@ try: def custom_excepthook(exc_type, exc_value, exc_traceback): """全局异常钩子，捕获所有未处理的异常""" - if exc_type.__name__ in ['OSError', 'IOError'] and 'Bad file descriptor' in str(exc_value): - # 处理 Bad file descriptor 错误，不导致服务器宕机 + error_str = str(exc_value) + if exc_type.__name__ in ['OSError', 'IOError'] and any(msg in error_str for msg in ['Bad file descriptor', 'Socket operation on non-socket', 'Operation on closed file']): + # 处理各种socket错误，不导致服务器宕机 if not is_duplicate_error(exc_value): print(f"[Global Error Handler] {exc_type.__name__}: {exc_value}") print("[Traceback]") From a8bccd7c3ffcb76058abd63db852a91c5f39e653 Mon Sep 17 00:00:00 2001 From: CakeCN Date: Thu, 8 Jan 2026 00:53:29 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=87=8D=E6=9E=84=E4=BA=86=E5=9F=BA?= =?UTF-8?q?=E4=BA=8Ewebsocket=E7=9A=84SSH=E7=BB=88=E7=AB=AF=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E6=96=B9=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/sockets/terminal_service.py | 295 ++++++++++++++---- 1 file changed, 226 insertions(+), 69 deletions(-) diff --git a/code-server-like/app/sockets/terminal_service.py b/code-server-like/app/sockets/terminal_service.py index c13a2a1..106e647 100644 --- a/code-server-like/app/sockets/terminal_service.py +++ b/code-server-like/app/sockets/terminal_service.py @@ -14,6 +14,7 @@ import termios import struct import fcntl import psutil + TERM_INIT_CONFIG = { # instead of local server runnning this web terminal service # "domain" is the target that you want to access through local server (with this web terminal) @@ -24,9 +25,108 @@ TERM_INIT_CONFIG = { 'ssh': '/usr/bin/ssh' } } + terminal_bp = Blueprint('terminal', __name__, url_prefix='/vsc-like') +class TerminalSessionManager: + """终端会话管理器，用于统一管理所有终端会话""" + def __init__(self): + # 存储所有终端会话，key为session_id，value为会话配置 + self.sessions = {} + # 线程锁，保证多线程安全 + self.lock = threading.Lock() + # 最大终端数量限制 + self.max_terminals = 100 + # 终端空闲超时时间（秒） + self.idle_timeout = 3600 # 1小时 + + def create_session(self): + """创建新的终端会话""" + with self.lock: + # 检查是否达到最大终端数量 + if len(self.sessions) >= self.max_terminals: + return None, "Maximum number of terminals reached" + + # 生成唯一的会话ID和房间ID + session_id = str(uuid.uuid4()) + room_id = f"terminal_{session_id}" + + # 创建会话配置 + session_config = { + **TERM_INIT_CONFIG.copy(), + 'session_id': session_id, + 'room_id': room_id, + 'created_at': time.time(), + 'last_activity': time.time() + } + + # 保存会话 + self.sessions[session_id] = session_config + + return session_config, None + + def get_session(self, session_id): + """获取会话配置""" + with self.lock: + return self.sessions.get(session_id) + + def update_session(self, session_id, updates): + """更新会话配置""" + with self.lock: + if session_id not in self.sessions: + return False + + # 更新会话配置 + self.sessions[session_id].update(updates) + # 更新最后活动时间 + self.sessions[session_id]['last_activity'] = time.time() + + return True + + def delete_session(self, session_id): + """删除会话""" + with self.lock: + if session_id in self.sessions: + del self.sessions[session_id] + return True + return False + + def get_session_by_room_id(self, room_id): + """通过房间ID获取会话""" + with self.lock: + for session_config in self.sessions.values(): + if session_config.get('room_id') == room_id: + return session_config + return None + + def cleanup_inactive_sessions(self): + """清理不活动的会话""" + with self.lock: + current_time = time.time() + expired_sessions = [] + + # 找出超时的会话 + for session_id, session_config in self.sessions.items(): + if current_time - session_config['last_activity'] > self.idle_timeout: + expired_sessions.append(session_id) + + # 删除超时的会话 + for session_id in expired_sessions: + del self.sessions[session_id] + + return expired_sessions + + def get_active_session_count(self): + """获取当前活动会话数量""" + with self.lock: + return len(self.sessions) + + +# 创建全局终端会话管理器实例 +terminal_manager = TerminalSessionManager() + + def set_winsize(fd, row, col, xpix=0, ypix=0): try: @@ -123,28 +223,26 @@ def read_and_forward_pty_output(fd=None, pid=None, room_id=None, namespace=None) pass class VSCLikeNameSpace(Namespace): - def create_terminal(self): - """创建新的终端并更新session配置""" - terminal_config = session.get('terminal_config', {}) - - # 如果没有房间ID，创建一个新的 - if not terminal_config.get('room_id'): - session_id = str(uuid.uuid4()) - room_id = f"terminal_{session_id}" - join_room(room_id) - terminal_config.update({ - **TERM_INIT_CONFIG.copy(), - 'session_id': session_id, - 'room_id': room_id - }) - else: - room_id = terminal_config['room_id'] + def __init__(self, namespace=None): + super().__init__(namespace) + # 存储客户端socket_id到session_id的映射 + self.socket_session_map = {} + # 线程锁，保证多线程安全 + self.lock = threading.Lock() + + def create_terminal(self, session_id): + """创建新的终端并更新会话配置""" + # 获取会话配置 + terminal_config = terminal_manager.get_session(session_id) + if not terminal_config: + current_app.logger.error(f"Session not found: {session_id}") + return None + room_id = terminal_config['room_id'] current_app.logger.debug(f"Creating new terminal for room: {room_id}") # create child process attached to a pty we can read from and write to (child_pid, fd) = pty.fork() - lesson_path = session.get('path') if child_pid == 0: # this is the child process fork. # anything printed here will show up in the pty, including the output @@ -157,14 +255,14 @@ class VSCLikeNameSpace(Namespace): print("Terminal type not specified, exit") os._exit(1) - path = TERM_INIT_CONFIG.get('client_path', {}).get(term_type, None) + path = terminal_config.get('client_path', {}).get(term_type, None) if not path or not os.path.exists(path): print(f"Can't locate {term_type} binary at {path}, exit") os._exit(1) # 获取连接参数 username = terminal_config.get('username') - domain = terminal_config.get('domain', TERM_INIT_CONFIG['domain']) + domain = terminal_config.get('domain') port = terminal_config.get('port') if not username or not domain: @@ -188,11 +286,12 @@ class VSCLikeNameSpace(Namespace): print(f"Error in child process: {e}") os._exit(1) else: - # 更新会话配置，保存到session中 - terminal_config['fd'] = fd - terminal_config['child_pid'] = child_pid - session['terminal_config'] = terminal_config - session.modified = True + # 更新会话配置，保存到终端管理器 + updates = { + 'fd': fd, + 'child_pid': child_pid + } + terminal_manager.update_session(session_id, updates) # 设置初始窗口大小 set_winsize(fd, 50, 50) @@ -208,31 +307,41 @@ class VSCLikeNameSpace(Namespace): def on_connect(self): """new client connected""" - # 为每个客户端生成唯一的会话ID和房间ID - session_id = str(uuid.uuid4()) - room_id = f"terminal_{session_id}" + # 创建新的终端会话 + terminal_config, error = terminal_manager.create_session() + if not terminal_config: + current_app.logger.error(f"Failed to create terminal session: {error}") + return + + session_id = terminal_config['session_id'] + room_id = terminal_config['room_id'] # 加入房间 join_room(room_id) - # 确保terminal_config存在于session中，每个客户端有独立配置 - terminal_config = { - **TERM_INIT_CONFIG.copy(), - 'session_id': session_id, - 'room_id': room_id - } - session['terminal_config'] = terminal_config - session.modified = True + # 保存socket_id到session_id的映射 + socket_id = request.sid + with self.lock: + self.socket_session_map[socket_id] = session_id - current_app.logger.debug(f"Client connected, session_id: {session_id}, room_id: {room_id}") + current_app.logger.debug(f"Client connected, session_id: {session_id}, room_id: {room_id}, socket_id: {socket_id}") # 创建终端 - self.create_terminal() + self.create_terminal(session_id) current_app.logger.debug("background task running") def on_pty_input(self, data): """write to the child pty, which now is the ssh process from this machine to the 'domain' configured """ + # 获取socket_id对应的session_id + socket_id = request.sid + with self.lock: + session_id = self.socket_session_map.get(socket_id) + + if not session_id: + current_app.logger.error(f"No session found for socket: {socket_id}") + return + # 输入验证 if not isinstance(data, dict): current_app.logger.error("Invalid input format: expected dictionary") @@ -249,34 +358,47 @@ class VSCLikeNameSpace(Namespace): current_app.logger.warning("Input truncated due to length") try: - terminal_config = session.get('terminal_config', {}) + terminal_config = terminal_manager.get_session(session_id) + if not terminal_config: + current_app.logger.error(f"Session not found: {session_id}") + return + child_pid = terminal_config.get('child_pid') # 如果没有子进程，重新创建终端 if not child_pid: - current_app.logger.debug("No child process found, creating new terminal") - terminal_config = self.create_terminal() + current_app.logger.debug(f"No child process found for session: {session_id}, creating new terminal") + terminal_config = self.create_terminal(session_id) + if not terminal_config: + current_app.logger.error(f"Failed to create new terminal for session: {session_id}") + return child_pid = terminal_config.get('child_pid') if not child_pid: - current_app.logger.error("Failed to create new terminal") + current_app.logger.error(f"Failed to get child_pid for session: {session_id}") return # 检查子进程是否存在且运行中 try: child_process = psutil.Process(child_pid) if child_process.status() not in ('running', 'sleeping'): - current_app.logger.debug("Child process not running, creating new terminal") - terminal_config = self.create_terminal() + current_app.logger.debug(f"Child process not running for session: {session_id}, creating new terminal") + terminal_config = self.create_terminal(session_id) + if not terminal_config: + current_app.logger.error(f"Failed to create new terminal for session: {session_id}") + return child_pid = terminal_config.get('child_pid') if not child_pid: - current_app.logger.error("Failed to create new terminal") + current_app.logger.error(f"Failed to get child_pid for session: {session_id}") return except psutil.NoSuchProcess: - current_app.logger.debug("Child process not found, creating new terminal") - terminal_config = self.create_terminal() + current_app.logger.debug(f"Child process not found for session: {session_id}, creating new terminal") + terminal_config = self.create_terminal(session_id) + if not terminal_config: + current_app.logger.error(f"Failed to create new terminal for session: {session_id}") + return child_pid = terminal_config.get('child_pid') if not child_pid: - current_app.logger.error("Failed to create new terminal") + current_app.logger.error(f"Failed to get child_pid for session: {session_id}") return # 获取文件描述符并写入数据 @@ -286,18 +408,27 @@ class VSCLikeNameSpace(Namespace): os.write(fd, input_data.encode()) except (OSError, IOError) as e: # File descriptor closed or invalid, create new terminal - current_app.logger.debug(f"Error writing to file descriptor: {e}, creating new terminal") - terminal_config = self.create_terminal() + current_app.logger.debug(f"Error writing to file descriptor: {e}, creating new terminal for session: {session_id}") + self.create_terminal(session_id) except Exception as e: current_app.logger.error(f"Error in pty_input handling: {e}") # 发生异常时尝试重新创建终端 try: - self.create_terminal() + self.create_terminal(session_id) except Exception as create_err: current_app.logger.error(f"Failed to recreate terminal: {create_err}") def on_resize(self, data): + # 获取socket_id对应的session_id + socket_id = request.sid + with self.lock: + session_id = self.socket_session_map.get(socket_id) + + if not session_id: + current_app.logger.error(f"No session found for socket: {socket_id}") + return + # 输入验证 if not isinstance(data, dict): current_app.logger.error("Invalid resize data format: expected dictionary") @@ -317,34 +448,47 @@ class VSCLikeNameSpace(Namespace): return try: - terminal_config = session.get('terminal_config', {}) + terminal_config = terminal_manager.get_session(session_id) + if not terminal_config: + current_app.logger.error(f"Session not found: {session_id}") + return + child_pid = terminal_config.get('child_pid') # 如果没有子进程，重新创建终端 if not child_pid: - current_app.logger.debug("No child process found for resize, creating new terminal") - terminal_config = self.create_terminal() + current_app.logger.debug(f"No child process found for resize, creating new terminal for session: {session_id}") + terminal_config = self.create_terminal(session_id) + if not terminal_config: + current_app.logger.error(f"Failed to create new terminal for resize, session: {session_id}") + return child_pid = terminal_config.get('child_pid') if not child_pid: - current_app.logger.error("Failed to create new terminal for resize") + current_app.logger.error(f"Failed to get child_pid for resize, session: {session_id}") return # 检查子进程是否存在且运行中 try: child_process = psutil.Process(child_pid) if child_process.status() not in ('running', 'sleeping'): - current_app.logger.debug("Child process not running for resize, creating new terminal") - terminal_config = self.create_terminal() + current_app.logger.debug(f"Child process not running for resize, creating new terminal for session: {session_id}") + terminal_config = self.create_terminal(session_id) + if not terminal_config: + current_app.logger.error(f"Failed to create new terminal for resize, session: {session_id}") + return child_pid = terminal_config.get('child_pid') if not child_pid: - current_app.logger.error("Failed to create new terminal for resize") + current_app.logger.error(f"Failed to get child_pid for resize, session: {session_id}") return except psutil.NoSuchProcess: - current_app.logger.debug("Child process not found for resize, creating new terminal") - terminal_config = self.create_terminal() + current_app.logger.debug(f"Child process not found for resize, creating new terminal for session: {session_id}") + terminal_config = self.create_terminal(session_id) + if not terminal_config: + current_app.logger.error(f"Failed to create new terminal for resize, session: {session_id}") + return child_pid = terminal_config.get('child_pid') if not child_pid: - current_app.logger.error("Failed to create new terminal for resize") + current_app.logger.error(f"Failed to get child_pid for resize, session: {session_id}") return # 获取文件描述符并调整窗口大小 @@ -355,24 +499,37 @@ class VSCLikeNameSpace(Namespace): set_winsize(fd, rows, cols) except (OSError, IOError) as e: # 文件描述符无效，创建新终端 - current_app.logger.debug(f"Error resizing terminal: {e}, creating new terminal") - terminal_config = self.create_terminal() + current_app.logger.debug(f"Error resizing terminal: {e}, creating new terminal for session: {session_id}") + self.create_terminal(session_id) except Exception as e: current_app.logger.error(f"Error in resize handling: {e}") # 发生异常时尝试重新创建终端 try: - self.create_terminal() + self.create_terminal(session_id) except Exception as create_err: current_app.logger.error(f"Failed to recreate terminal for resize: {create_err}") def on_disconnect(self): - terminal_config = session.get('terminal_config', {}) + # 获取socket_id对应的session_id + socket_id = request.sid + with self.lock: + session_id = self.socket_session_map.pop(socket_id, None) + + if not session_id: + current_app.logger.error(f"No session found for socket: {socket_id}") + return + + # 获取会话配置 + terminal_config = terminal_manager.get_session(session_id) + if not terminal_config: + current_app.logger.error(f"Session not found: {session_id}") + return + child_pid = terminal_config.get('child_pid') fd = terminal_config.get('fd') room_id = terminal_config.get('room_id') - session_id = terminal_config.get('session_id') - current_app.logger.debug(f"Client disconnecting, session_id: {session_id}, room_id: {room_id}") + current_app.logger.debug(f"Client disconnecting, session_id: {session_id}, room_id: {room_id}, socket_id: {socket_id}") # 退出房间 if room_id: @@ -415,9 +572,9 @@ class VSCLikeNameSpace(Namespace): except Exception as err: current_app.logger.error(f'Error terminating process: {err}') - # Clear session config for this client - session.pop('terminal_config', None) - session.modified = True + # 从终端管理器中删除会话 + terminal_manager.delete_session(session_id) + current_app.logger.debug(f"Session deleted: {session_id}") current_app.logger.debug(f"Client disconnected, session_id: {session_id}, room_id: {room_id}") current_app.logger.debug('Client disconnected') \ No newline at end of file