Compare commits
61 Commits
3c8821b225
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
36bbedd3cf | ||
|
|
0e3703b1f4 | ||
|
|
52696707dd | ||
|
|
0a812e496f | ||
|
|
de1ba08d7e | ||
|
|
3f14cbd6c1 | ||
|
|
c51565199c | ||
|
|
8d29a26d7d | ||
|
|
decf24020a | ||
|
|
3dc219adc2 | ||
|
|
40d1341685 | ||
|
|
0d606fb171 | ||
|
|
e1f32ec980 | ||
|
|
ad8d7d069c | ||
|
|
687b316db6 | ||
|
|
60248d5c51 | ||
|
|
befec5543c | ||
|
|
af24c51a2f | ||
|
|
fa91696aae | ||
|
|
e698c50a4b | ||
|
|
75795dd853 | ||
|
|
5b8180b48e | ||
|
|
09103abf38 | ||
|
|
6ecd0c6735 | ||
|
|
a07eee1ffc | ||
|
|
848b235ddc | ||
|
|
7f469803df | ||
|
|
4dd2667785 | ||
|
|
f8e0b461ba | ||
|
|
607c6dfbab | ||
|
|
73275cffad | ||
|
|
ee20e8b85b | ||
|
|
b806da10c4 | ||
|
|
f818d84208 | ||
|
|
9231c14013 | ||
|
|
8aa567cdf2 | ||
|
|
a3b3018de7 | ||
|
|
761095d61d | ||
| 643c16fdf7 | |||
| 5082436289 | |||
| 7193b9a000 | |||
| 042f6ee99e | |||
|
|
8fd88b0088 | ||
|
|
319b111485 | ||
|
|
f060a17f6a | ||
|
|
ecdc2e320f | ||
|
|
aa9f39ca18 | ||
|
|
f444e86136 | ||
|
|
22d9fb39f1 | ||
| 68493d6a62 | |||
| f3c30a80a3 | |||
| f09d82571f | |||
|
|
cb435ecade | ||
|
|
c8942cedac | ||
|
|
1f6e75f006 | ||
|
|
5438dc99ba | ||
|
|
f65b5bf32a | ||
|
|
da93289799 | ||
|
|
1554c85616 | ||
|
|
70410d2c4b | ||
|
|
496c5be90a |
@@ -39,9 +39,12 @@ class ASEngineClient:
|
||||
# 连接事件
|
||||
@self.sio.on('connect', namespace=self.namespace)
|
||||
def on_connect():
|
||||
print("---------------ASEngineClient on_connect----------------")
|
||||
self.sid = self.sio.sid
|
||||
print(f"Connected to server with sid: {self.sid}")
|
||||
|
||||
self.connected = True
|
||||
self.sid = self.sio.get_sid(namespace=self.namespace)
|
||||
print(f"Connected to server. SID: {self.sid}")
|
||||
self.sio.emit('join', {'id': self.id}, namespace=self.namespace)
|
||||
if self._on_connect_callback is not None:
|
||||
self._on_connect_callback(
|
||||
self,
|
||||
|
||||
@@ -35,7 +35,6 @@ class ChatManager:
|
||||
_lock = threading.RLock()
|
||||
def __init__(self, restart=False):
|
||||
self.restart = restart
|
||||
self.chapter_chain_now = -1
|
||||
self.ase_client = None
|
||||
self.app = None
|
||||
self.socketio = None
|
||||
@@ -70,6 +69,9 @@ class ChatManager:
|
||||
self.chapter_chain = load_chapters(raw_markdown, raw_markdown_prompts, raw_score_prompts)
|
||||
self.bb = None
|
||||
self.chat_historys = []
|
||||
self.chapter_chain_now = 0
|
||||
self.scores = []
|
||||
|
||||
|
||||
|
||||
def send_to_vscode(self, event: str, data: dict, room: str = None, namespace: str = '/vscode'):
|
||||
|
||||
@@ -14,7 +14,7 @@ from typing import Optional
|
||||
mongo = PyMongo()
|
||||
|
||||
|
||||
socketio = SocketIO(cors_allowed_origins="*",max_payload_size=52428800, async_mode="eventlet") # 不直接传 app
|
||||
socketio = SocketIO(cors_allowed_origins="*",max_payload_size=52428800, async_mode="eventlet",always_connect=False) # 不直接传 app
|
||||
cors = CORS()
|
||||
# ===== 你的全局对象 =====
|
||||
# Backboard
|
||||
@@ -38,7 +38,7 @@ def init_extensions(app):
|
||||
cors_allowed_origins='*',#app.config["VSCODE_WEB_URL"],
|
||||
ping_timeout=app.config["SOCKETIO_PING_TIMEOUT"],
|
||||
ping_interval=app.config["SOCKETIO_PING_INTERVAL"],
|
||||
max_payload_size=50000000, async_mode="eventlet"
|
||||
max_payload_size=50000000, async_mode="eventlet",always_connect=False
|
||||
)
|
||||
cors.init_app(
|
||||
app,
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
import requests
|
||||
from flask_socketio import Namespace
|
||||
|
||||
|
||||
def clear_user_session(asengine_url, asengine_token, user_id):
|
||||
'''
|
||||
@@ -28,15 +26,23 @@ def on_connect_to_ase(client, entry, init_data, **kwargs):
|
||||
'''
|
||||
此时刚刚建立好aseclient连接,并向前端发送打开code-server-like指令。
|
||||
'''
|
||||
namespace_entry, ase_client = entry
|
||||
namespace_entry, ase_client, logger = entry
|
||||
logger.info(f"on_connect_to_ase with init_data: {init_data}")
|
||||
namespace_entry.emit('open-iframe',"", room=init_data['room'], namespace='/agent')
|
||||
namespace_entry.emit('message', "Agents服务已连接, 加载教案中", room=init_data['room'], namespace='/agent')
|
||||
namespace_entry.emit('message', f'{init_data}', room=init_data['room'], namespace='/agent')
|
||||
|
||||
|
||||
restart = init_data.get("restart", False)
|
||||
if restart: # 重启时,从-1章进入 0章
|
||||
ase_client.chatmanager.next_chapter()
|
||||
# 不再需要手动next_chapter,因为已经在on_login中根据mongo进度恢复了正确的章节
|
||||
# if restart: # 重启时,从-1章进入 0章
|
||||
# ase_client.chatmanager.next_chapter()
|
||||
|
||||
# 根据restart决定是否重新加载代码
|
||||
ase_client.chatmanager.load_now_chapter(load_code=restart)
|
||||
print("load_now_chapter with restart:", restart)
|
||||
|
||||
# 只有当需要restart时才发送chapter-start
|
||||
if restart:
|
||||
ase_client.send_text("chapter-start", "")
|
||||
namespace_entry.emit('message', "教案加载完毕", room=init_data['room'], namespace='/agent')
|
||||
|
||||
@@ -93,7 +93,6 @@ def get_multiagents_dialog_list(user_id: str) -> List[Dict]:
|
||||
|
||||
# 检查响应
|
||||
if response.status_code == 200:
|
||||
current_app.logger.info(f"获取MultiAgents对话列表成功: user_id={user_id}, json={response.json()}")
|
||||
return response.json()
|
||||
else:
|
||||
current_app.logger.error(f"获取MultiAgents对话列表失败: HTTP {response.status_code}")
|
||||
|
||||
@@ -63,6 +63,12 @@ class VSCodeNamespace(Namespace):
|
||||
|
||||
|
||||
class AgentNamespace(Namespace):
|
||||
def __init__(self, namespace):
|
||||
super().__init__(namespace)
|
||||
# 使用字典存储每个用户的chatmanager和ase_client,避免多用户冲突
|
||||
self.user_chatmanagers = {}
|
||||
self.user_ase_clients = {}
|
||||
|
||||
def _load_learning_progress(self, chatmanager, user_id, course_id, chapter_name, lesson_name, continue_learn):
|
||||
"""加载并恢复用户学习进度
|
||||
|
||||
@@ -72,38 +78,39 @@ class AgentNamespace(Namespace):
|
||||
course_id: 课程ID
|
||||
chapter_name: 章节名称
|
||||
lesson_name: 课时名称
|
||||
continue_learn: 是否继续学习
|
||||
continue_learn: 是否继续学习(现在总是为True,保持兼容性)
|
||||
|
||||
Returns:
|
||||
int: 需要跳过的章节数
|
||||
"""
|
||||
need_skip_chapters = 0
|
||||
# 总是从mongo加载学习进度
|
||||
progress_result = load_learning_progress(user_id, course_id, chapter_name, lesson_name)
|
||||
|
||||
if continue_learn: # 尝试加载用户学习进度
|
||||
progress_result = load_learning_progress(user_id, course_id, chapter_name, lesson_name)
|
||||
if progress_result['exists']:
|
||||
progress = progress_result['data']
|
||||
# 恢复学习进度数据
|
||||
if 'scores' in progress:
|
||||
chatmanager.scores = progress['scores']
|
||||
|
||||
if progress_result['exists']:
|
||||
progress = progress_result['data']
|
||||
# 恢复学习进度数据
|
||||
if 'scores' in progress:
|
||||
# 根据scores的数量确定需要跳过的章节数
|
||||
need_skip_chapters = len(progress['scores'])
|
||||
chatmanager.scores = progress['scores']
|
||||
|
||||
# 恢复聊天历史
|
||||
if 'chat_historys' in progress:
|
||||
chatmanager.chat_historys = progress['chat_historys']
|
||||
else:
|
||||
chatmanager.chat_historys = []
|
||||
|
||||
# 恢复当前章节链
|
||||
if 'chapter_chain_now' in progress:
|
||||
chatmanager.chapter_chain_now = progress['chapter_chain_now']
|
||||
upload_learning_progress_to_cloud(progress)
|
||||
# 恢复聊天历史
|
||||
if 'chat_historys' in progress:
|
||||
chatmanager.chat_historys = progress['chat_historys']
|
||||
else:
|
||||
# 使用默认值,确保有完整的结构
|
||||
chatmanager.chat_historys = progress_result['data']['chat_historys']
|
||||
chatmanager.scores = progress_result['data']['scores']
|
||||
chatmanager.chat_historys = []
|
||||
|
||||
# 恢复当前章节链
|
||||
if 'chapter_chain_now' in progress:
|
||||
chatmanager.chapter_chain_now = progress['chapter_chain_now']
|
||||
upload_learning_progress_to_cloud(progress)
|
||||
|
||||
# 计算需要跳过的章节数:从初始的-1到当前的chapter_chain_now
|
||||
need_skip_chapters = chatmanager.chapter_chain_now
|
||||
else:
|
||||
# 使用默认值,确保有完整的结构
|
||||
chatmanager.chat_historys = progress_result['data']['chat_historys']
|
||||
chatmanager.scores = progress_result['data']['scores']
|
||||
chatmanager.chapter_chain_now = 0
|
||||
need_skip_chapters = 0
|
||||
|
||||
return need_skip_chapters
|
||||
|
||||
@@ -119,8 +126,8 @@ class AgentNamespace(Namespace):
|
||||
chapter_name = data['chapter_name']
|
||||
user_id = uuid2username[user_uuid]
|
||||
session['user_uuid'] = user_uuid
|
||||
join_room(user_uuid, namespace='/agent') # 将该用户加入以user_id为名的room
|
||||
print(f'User connected with session user_uuid: {user_uuid}')
|
||||
join_room(user_uuid)
|
||||
|
||||
user_uuid2chatmanager = ex["user_uuid2chatmanager"]
|
||||
user_uuid2ase_client = ex["user_uuid2ase_client"]
|
||||
@@ -131,8 +138,9 @@ class AgentNamespace(Namespace):
|
||||
chatmanager.function_manager.add_function(next_chapter, {'user_uuid': user_uuid})
|
||||
|
||||
clear_user_session(current_app.config["ASE_ENGINE_URL"], current_app.config["ASE_ENGINE_URL_TOKEN"], user_id)
|
||||
continue_learn = not chatmanager.restart
|
||||
need_skip_chapters = self._load_learning_progress(chatmanager, user_id, course_id, chapter_name, lesson_name, continue_learn)
|
||||
|
||||
# 总是从mongo加载进度,不管restart状态
|
||||
need_skip_chapters = self._load_learning_progress(chatmanager, user_id, course_id, chapter_name, lesson_name, True)
|
||||
|
||||
fmd,fmdp,fsp = load_full_markdown_file(course_id, chapter_name, lesson_name)
|
||||
user_uuid2ase_client[user_uuid] = HSAEngineClient(current_app.config["ASE_ENGINE_URL"], current_app.config["ASE_ENGINE_NAMESPACE"],id=user_id, chatmanager = chatmanager)
|
||||
@@ -141,27 +149,33 @@ class AgentNamespace(Namespace):
|
||||
backboard_manager.add_backboard(user_uuid, user_id, course_id,
|
||||
lesson_name, root_path=f'/home/{user_id}/{course_id}/{chapter_name}/{lesson_name}')
|
||||
chatmanager.bb = backboard_manager.get_backboard(user_uuid)
|
||||
# 如果有保存的进度,需要跳过已经完成的章节、无需清空代码、对话历史恢复
|
||||
if continue_learn:
|
||||
for _ in range(need_skip_chapters):
|
||||
chatmanager.next_chapter()
|
||||
emit('next_chapter', room=user_uuid, namespace='/agent')
|
||||
# 恢复对话历史到前端 - 使用批量发送消息列表
|
||||
if chatmanager.chat_historys:
|
||||
emit('messages', chatmanager.chat_historys, room=user_uuid, namespace='/agent')
|
||||
|
||||
self.chatmanager = chatmanager
|
||||
self.ase_client = user_uuid2ase_client[user_uuid]
|
||||
# 总是根据进度跳过章节,恢复对话历史
|
||||
for _ in range(need_skip_chapters):
|
||||
chatmanager.next_chapter()
|
||||
emit('next_chapter', room=user_uuid, namespace='/agent')
|
||||
# 恢复对话历史到前端 - 使用批量发送消息列表
|
||||
if chatmanager.chat_historys:
|
||||
emit('messages', chatmanager.chat_historys, room=user_uuid, namespace='/agent')
|
||||
|
||||
# 存储每个用户的chatmanager和ase_client到字典中,使用用户UUID作为键
|
||||
self.user_chatmanagers[user_uuid] = chatmanager
|
||||
self.user_ase_clients[user_uuid] = user_uuid2ase_client[user_uuid]
|
||||
|
||||
# 将restart设置为False,避免后续重复处理
|
||||
restart = chatmanager.restart
|
||||
chatmanager.restart = False
|
||||
|
||||
user_uuid2ase_client[user_uuid].register_on_connect_entry(
|
||||
callback=on_connect_to_ase,
|
||||
entry=(self, user_uuid2ase_client[user_uuid]),
|
||||
init_data={'room':user_uuid, 'restart':chatmanager.restart}
|
||||
entry=(self, user_uuid2ase_client[user_uuid], current_app.logger),
|
||||
init_data={'room':user_uuid, 'restart':restart}
|
||||
)
|
||||
user_uuid2ase_client[user_uuid].register_route_with_entry(
|
||||
route='dialog',
|
||||
callback=receive_ase_dialog,
|
||||
entry=self,
|
||||
init_data={'room': user_uuid}
|
||||
init_data={'room':user_uuid}
|
||||
)
|
||||
user_uuid2ase_client[user_uuid].register_route_with_entry(
|
||||
route='dialog-hint',
|
||||
@@ -179,13 +193,13 @@ class AgentNamespace(Namespace):
|
||||
route='judge',
|
||||
callback=receive_ase_judge,
|
||||
entry=self,
|
||||
init_data={'room': user_uuid}
|
||||
init_data={'room':user_uuid}
|
||||
)
|
||||
user_uuid2ase_client[user_uuid].register_route_with_entry(
|
||||
route='next_chapter',
|
||||
callback=receive_ase_next_chapter,
|
||||
entry=self,
|
||||
init_data={'room': user_uuid}
|
||||
init_data={'room':user_uuid}
|
||||
)
|
||||
user_uuid2ase_client[user_uuid].register_route_with_entry(
|
||||
route='chapter_score',
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -60,6 +60,7 @@
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
|
||||
cursor: pointer;
|
||||
position: relative; /* 添加相对定位 */
|
||||
}
|
||||
|
||||
.course-image {
|
||||
@@ -81,6 +82,27 @@
|
||||
.course-description {
|
||||
font-size: 14px;
|
||||
color: #555;
|
||||
margin-bottom: 10px;
|
||||
display: -webkit-box; /* 使用-webkit-box实现文本截断 */
|
||||
-webkit-line-clamp: 3; /* 限制显示3行 */
|
||||
-webkit-box-orient: vertical; /* 垂直排列 */
|
||||
overflow: hidden; /* 隐藏溢出内容 */
|
||||
text-overflow: ellipsis; /* 用省略号表示截断 */
|
||||
}
|
||||
|
||||
/* 课程日期信息 */
|
||||
.course-date {
|
||||
position: absolute; /* 绝对定位到底部 */
|
||||
bottom: 10px; /* 距离底部10px */
|
||||
left: 0; /* 左对齐 */
|
||||
right: 0; /* 右对齐 */
|
||||
padding: 10px; /* 内边距 */
|
||||
background-color: white; /* 白色背景 */
|
||||
border-radius: 5px; /* 圆角 */
|
||||
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); /* 阴影 */
|
||||
font-size: 12px; /* 字体大小 */
|
||||
color: #666; /* 字体颜色 */
|
||||
line-height: 1.5; /* 行高 */
|
||||
}
|
||||
|
||||
/* 课程目录弹出框 */
|
||||
@@ -159,11 +181,14 @@
|
||||
/* 浮窗内容 */
|
||||
.modal-content {
|
||||
background-color: #fff;
|
||||
margin: 15% auto;
|
||||
margin: 10% auto; /* 修改为10%以缩小顶部距离 */
|
||||
padding: 20px;
|
||||
border-radius: 10px;
|
||||
width: 40%;
|
||||
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
|
||||
width: 80%; /* 修改为80%以适应小屏幕 */
|
||||
max-width: 600px; /* 设置最大宽度 */
|
||||
box-shadow: 0 4px 8px rgba(0, 0, 0, 0 1);
|
||||
overflow-y: auto; /* 添加垂直滚动条 */
|
||||
max-height: 80vh; /* 设置最大高度 */
|
||||
}
|
||||
|
||||
/* 按钮样式 */
|
||||
@@ -205,7 +230,34 @@ label {
|
||||
margin-top: 20px; /* 上方间距 */
|
||||
}
|
||||
|
||||
/* 选择课程或新建课程的下拉框 */
|
||||
.course-selection-container {
|
||||
margin: 10px 0;
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
#course-selection {
|
||||
width: 100%; /* 占满一行 */
|
||||
padding: 12px; /* 增加内边距 */
|
||||
font-size: 16px; /* 调整字体大小 */
|
||||
margin: 10px 0; /* 上下留间距 */
|
||||
border: 2px solid #ccc; /* 边框 */
|
||||
border-radius: 8px; /* 圆角边框 */
|
||||
background-color: #f9f9f9; /* 背景色 */
|
||||
transition: border 0.3s ease, box-shadow 0.3s ease; /* 添加过渡效果 */
|
||||
}
|
||||
|
||||
/* 鼠标悬停时下拉框的效果 */
|
||||
#course-selection:hover {
|
||||
border-color: #4CAF50; /* 悬停时的边框颜色 */
|
||||
box-shadow: 0 0 10px rgba(76, 175, 80, 0.5); /* 悬停时的阴影效果 */
|
||||
}
|
||||
|
||||
/* 下拉框选中项的样式 */
|
||||
#course-selection option {
|
||||
padding: 10px;
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
/* 添加课程按钮样式 */
|
||||
.add-course-button {
|
||||
@@ -433,6 +485,20 @@ label[for="course-description"] {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.delete-course-btn {
|
||||
background-color: #e74c3c;
|
||||
color: white;
|
||||
padding: 10px;
|
||||
border-radius: 5px;
|
||||
cursor: pointer;
|
||||
width: 100%;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.delete-course-btn:hover {
|
||||
background-color: #c0392b;
|
||||
}
|
||||
|
||||
/* 编辑弹窗 */
|
||||
.edit-modal {
|
||||
display: none;
|
||||
|
||||
@@ -66,31 +66,29 @@ function cleanupExpiredApprovals() {
|
||||
// 定时清理过期记录
|
||||
setInterval(cleanupExpiredApprovals, 3000); // 每3秒检查一次
|
||||
document.addEventListener('DOMContentLoaded', function () {
|
||||
data = window.appData;
|
||||
user_data = window.appData;
|
||||
const host = window.location.host;
|
||||
console.log(`Connecting to WebSocket server at wss://${host}/agent`);
|
||||
socket = io(`wss://${host}/agent`, {
|
||||
query: {
|
||||
user_uuid: data.user_uuid,
|
||||
folder: data.folder
|
||||
user_uuid: user_data.user_uuid,
|
||||
folder: user_data.folder
|
||||
}
|
||||
});
|
||||
|
||||
// 初始化聊天消息管理器
|
||||
chatManager = new ChatMessageManager();
|
||||
|
||||
socket.on('connect', function () {
|
||||
console.log('Connected to server');
|
||||
socket.emit('login',JSON.stringify(data));
|
||||
console.log('Connected to WebSocket server'+socket.id+"with user"+JSON.stringify(user_data));
|
||||
socket.emit('login',JSON.stringify(user_data));
|
||||
});
|
||||
socket.on('open-iframe', function(data) {
|
||||
OpenIframe();
|
||||
socket.on('open-iframe', function() {
|
||||
OpenIframe(user_data);
|
||||
});
|
||||
// 监听来自服务器的消息
|
||||
socket.on('voiceMessage', function (data) {
|
||||
console.log(data);
|
||||
const input = document.getElementById('messageInput');
|
||||
input.value += data;
|
||||
input.value = data;
|
||||
});
|
||||
socket.on('message', function (data) {
|
||||
// 显示服务器的回复消息 - 单个消息
|
||||
|
||||
@@ -1,41 +1,53 @@
|
||||
function show_books(courses_data, user_selected_courses){
|
||||
function show_books(courses_data, user_selected_courses) {
|
||||
console.log(courses_data)
|
||||
console.log(user_selected_courses)
|
||||
}
|
||||
function show_course_details(course_id){
|
||||
function show_course_details(course_id) {
|
||||
window.location.href = '/course/' + course_id
|
||||
}
|
||||
|
||||
function on_click_select_course(event){
|
||||
function on_click_select_course(event) {
|
||||
event.stopPropagation(); // 阻止事件冒泡
|
||||
const courseId = event.currentTarget.getAttribute('data-course-id');
|
||||
if (event.currentTarget.classList.contains("selected-button")) {alert('课程已选择'); return;}
|
||||
const button = event.currentTarget;
|
||||
const courseId = button.getAttribute('data-course-id');
|
||||
if (!courseId) { alert('缺少课程ID'); return; }
|
||||
if (button.classList.contains("selected-button")) { alert('课程已选择'); return; }
|
||||
if (button.disabled) { return; }
|
||||
button.disabled = true;
|
||||
fetch(`/select_course`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'X-CSRFToken': '{{ csrf_token() }}' // 如果使用 CSRF 保护
|
||||
},
|
||||
body: JSON.stringify({ course_id: courseId })
|
||||
})
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
if (data.success) {
|
||||
// 更新按钮样式或显示消息
|
||||
this.classList.remove('select-button');
|
||||
this.classList.add('selected-button');
|
||||
this.textContent = '已选择';
|
||||
.then(async (response) => {
|
||||
let data = null;
|
||||
try {
|
||||
data = await response.json();
|
||||
} catch (_) {
|
||||
}
|
||||
if (!response.ok) {
|
||||
throw new Error(data?.message || `请求失败(${response.status})`);
|
||||
}
|
||||
return data;
|
||||
})
|
||||
.then((data) => {
|
||||
if (!data?.success) {
|
||||
throw new Error(data?.message || '选择课程失败');
|
||||
}
|
||||
button.classList.remove('select-button');
|
||||
button.classList.add('selected-button');
|
||||
button.textContent = '已选课';
|
||||
alert('选择课程成功');
|
||||
} else {
|
||||
alert('选择课程失败');
|
||||
}
|
||||
})
|
||||
.catch(error => {
|
||||
console.error('Error:', error);
|
||||
alert('选择课程失败');
|
||||
});
|
||||
})
|
||||
.catch(error => {
|
||||
console.error('Error:', error);
|
||||
alert(error?.message || '选择课程失败');
|
||||
button.disabled = false;
|
||||
});
|
||||
}
|
||||
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
document.addEventListener('DOMContentLoaded', function () {
|
||||
|
||||
});
|
||||
File diff suppressed because it is too large
Load Diff
@@ -292,13 +292,50 @@ function closeAddCourseModal() {
|
||||
document.getElementById('add-course-modal').style.display = 'none';
|
||||
}
|
||||
|
||||
// 显示删除课程确认弹窗
|
||||
function showDeleteCourseConfirmation() {
|
||||
if (!material_id) {
|
||||
alert('无法删除课程:未找到课程ID');
|
||||
return;
|
||||
}
|
||||
|
||||
if (confirm('确定要删除这个课程吗?此操作无法撤销!')) {
|
||||
deleteCourse(material_id);
|
||||
}
|
||||
}
|
||||
|
||||
// 删除课程
|
||||
function deleteCourse(courseId) {
|
||||
fetch(`/materials/${courseId}`, {
|
||||
method: 'DELETE',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
}
|
||||
})
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
if (data.message) {
|
||||
alert(data.message);
|
||||
if (data.success) {
|
||||
// 关闭侧边栏并刷新页面
|
||||
closeCourseDetails();
|
||||
location.reload();
|
||||
}
|
||||
}
|
||||
})
|
||||
.catch(error => {
|
||||
console.error('删除课程时出错:', error);
|
||||
alert('删除课程失败,请稍后再试!');
|
||||
});
|
||||
}
|
||||
|
||||
function onTeacherboardPageLoad(){
|
||||
// 提交表单处理
|
||||
document.getElementById('add-course-form').addEventListener('submit', function(event) {
|
||||
event.preventDefault();
|
||||
|
||||
const courseName = document.getElementById('course-name').value;
|
||||
const courseSelection = document.getElementById('course-selection').value;
|
||||
const courseSelection = document.getElementById('course-selection').value; // 获取选择值
|
||||
const coverImage = document.getElementById('cover-preview').src;
|
||||
const courseDescription = document.getElementById('course-description').value;
|
||||
// 构建发送的数据
|
||||
@@ -312,7 +349,7 @@ document.getElementById('add-course-form').addEventListener('submit', function(e
|
||||
// 如果选择了已有课程,可以通过 courseSelection 传递课程ID(根据需要修改)
|
||||
if (courseSelection !== 'new') {
|
||||
// 如果是修改已有课程,设置相关的章节信息或其他数据
|
||||
data.chapters = ["Chapter 1", "Chapter 2"]; // 示例章节信息
|
||||
data.chapters = ["Chapter 1", "Chapter 2"];
|
||||
}
|
||||
|
||||
// 发送 POST 请求到 /create_material
|
||||
|
||||
@@ -208,7 +208,7 @@
|
||||
console.error('Error fetching session:', error);
|
||||
});
|
||||
let lastiframe = null;
|
||||
function OpenIframe(){
|
||||
function OpenIframe(data){
|
||||
// 等待1s再加载
|
||||
setTimeout(() => {
|
||||
// 在成功获取 session 后创建并插入 iframe
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% include 'foot.html' %}
|
||||
{% include 'footer-brief.html' %}
|
||||
</body>
|
||||
<script>
|
||||
var course_id = "{{course_id}}";
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>华实学伴 - 专业的在线学习平台</title>
|
||||
<script src="/static/cdnback/jquery.min.js"></script>
|
||||
<link href="/static/cdnback/bootstrap.min.css" rel="stylesheet">
|
||||
<link rel="stylesheet" href="/static/cdnback/all.min.css">
|
||||
<link rel="stylesheet" href="/static/css/dashboard.css">
|
||||
@@ -13,7 +14,6 @@
|
||||
</head>
|
||||
<body>
|
||||
{% include 'navbar.html' %} <!-- 引入navbar.html -->
|
||||
{% include 'learning-path.html' %} <!-- 引入learning-path.html -->
|
||||
<section class="search-section">
|
||||
<div class="container">
|
||||
<div class="row justify-content-center">
|
||||
@@ -81,7 +81,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% include 'foot.html' %}
|
||||
{% include 'footer-brief.html' %}
|
||||
|
||||
<script src="/static/js/dashboard.js"></script>
|
||||
<script>
|
||||
|
||||
@@ -187,7 +187,7 @@
|
||||
|
||||
|
||||
let lastIframe = null;
|
||||
function OpenIframe(){
|
||||
function OpenIframe(data){
|
||||
// 在成功获取 session 后创建并插入 iframe
|
||||
const iframe = document.createElement('iframe');
|
||||
const div=document.getElementById('vscodeWeb')
|
||||
|
||||
11
Html/apps/templates/footer-brief.html
Normal file
11
Html/apps/templates/footer-brief.html
Normal file
@@ -0,0 +1,11 @@
|
||||
<link rel="stylesheet" href="/static/css/footer.css">
|
||||
<footer class="hs-footer">
|
||||
<div class="footer-main">
|
||||
|
||||
<div class="footer-bottom">
|
||||
<div class="footer-bottom-right">
|
||||
<span>© 2025 华实学伴. 保留所有权利</span>
|
||||
<a href="https://beian.miit.gov.cn" target="_blank">沪ICP备2025142149号</a>
|
||||
</div>
|
||||
</div>
|
||||
</footer>
|
||||
@@ -1,8 +1,9 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="zh">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>课程选择主页</title>
|
||||
<meta charset="UTF-8">
|
||||
<title>课程选择主页</title>
|
||||
<script src="/static/cdnback/jquery.min.js"></script>
|
||||
|
||||
<link href="/static/cdnback/bootstrap.min.css" rel="stylesheet">
|
||||
@@ -12,6 +13,7 @@
|
||||
<script src="/static/cdnback/js/bootstrap.bundle.min.js"></script>
|
||||
<link rel="stylesheet" href="/static/css/index.css">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
{% include 'navbar.html' %}
|
||||
|
||||
@@ -38,7 +40,7 @@
|
||||
<h2>课程列表</h2>
|
||||
<div class="course-cards" id="course-cards">
|
||||
{% for course in courses_data %}
|
||||
<!-- <div class="course-card" onclick="show_course_details('{{ course._id }}')">
|
||||
<!-- <div class="course-card" onclick="show_course_details('{{ course._id }}')">
|
||||
<img src="{{ course.image_url }}" alt="{{ course.course_name }}">
|
||||
<h3>{{ course.name }}</h3>
|
||||
<p>{{ course.description }}</p>
|
||||
@@ -49,10 +51,9 @@
|
||||
{% endif %}
|
||||
</div> -->
|
||||
|
||||
<div class="col-md-6 col-lg-4">
|
||||
<div class="col-md-6 col-lg-4">
|
||||
<div class="course-card card h-100" onclick="openCourseProgress('{{course._id}}')">
|
||||
<img src="{{course.image_url}}"
|
||||
class="course-img" alt="课程封面">
|
||||
<img src="{{course.image_url}}" class="course-img" alt="课程封面">
|
||||
<div class="card-body d-flex flex-column">
|
||||
<span class="course-category">算法设计</span>
|
||||
<h5 class="course-title">{{course.name}}</h5>
|
||||
@@ -62,11 +63,15 @@
|
||||
<span class="course-rating"><i class="fas fa-star"></i> 4.7</span>
|
||||
</div>
|
||||
<div class="mt-auto d-grid gap-2 d-md-flex">
|
||||
<button class="btn btn-view flex-fill" onclick="btn_view(event,'{{course._id}}')"><i class="far fa-eye me-1"></i> 课程</button>
|
||||
<button class="btn btn-view flex-fill" onclick="btn_view(event,'{{course._id}}')"><i
|
||||
class="far fa-eye me-1"></i> 课程</button>
|
||||
{% if course._id in selected_courses %}
|
||||
<button class="btn btn-process flex-fill selected-button" data-course-id="{{course._id}}">已选课</button>
|
||||
<button class="btn btn-process flex-fill selected-button"
|
||||
data-course-id="{{course._id}}">已选课</button>
|
||||
{% else %}
|
||||
<button class="btn btn-process flex-fill select-button" onclick="on_click_select_course(event)" data-course-id="{{course._id}}">选择课程</button>
|
||||
<button class="btn btn-process flex-fill select-button"
|
||||
onclick="on_click_select_course(event)"
|
||||
data-course-id="{{course._id}}">选择课程</button>
|
||||
{% endif %}
|
||||
|
||||
</div>
|
||||
@@ -80,7 +85,7 @@
|
||||
</main>
|
||||
|
||||
|
||||
{% include 'foot.html' %}
|
||||
{% include 'footer-brief.html' %}
|
||||
</body>
|
||||
<script>
|
||||
window.appData = {
|
||||
@@ -88,5 +93,6 @@
|
||||
}
|
||||
</script>
|
||||
<script src="/static/js/index.js"></script>
|
||||
</html>
|
||||
<script src="/static/js/dashboard.js"></script>
|
||||
|
||||
</html>
|
||||
@@ -65,7 +65,7 @@
|
||||
</div>
|
||||
</ul>
|
||||
<button class="add-chapter-btn" onclick="showInputForNewChapter()">新增章节</button>
|
||||
|
||||
<button class="delete-course-btn" onclick="showDeleteCourseConfirmation()">删除课程</button>
|
||||
</div>
|
||||
|
||||
<!-- 编辑章节或课时弹窗 -->
|
||||
@@ -100,8 +100,8 @@
|
||||
<label for="course-selection">从课程创建或新建课程:</label>
|
||||
<select id="course-selection">
|
||||
<option value="new">新建课程</option>
|
||||
{% for course in courses %}
|
||||
<option value="{{ course.id }}">{{ course.name }}</option>
|
||||
{% for course in materials %}
|
||||
<option value="{{ course._id }}">{{ course.name }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
<br><br>
|
||||
@@ -121,6 +121,6 @@
|
||||
<script src="/static/js/course_current.js"></script>
|
||||
<script src="/static/js/teacherboard.js"></script>
|
||||
<script src="/static/js/teacher_course_setting.js"></script>
|
||||
{% include 'foot.html' %}
|
||||
{% include 'footer-brief.html' %}
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
from flask import Blueprint, request, jsonify, current_app, session, render_template, session
|
||||
from bson import ObjectId
|
||||
from ..services.course_service import create_material, update_material, get_materials_by_teacher, load_material, get_materials_by_teacher_dict, add_material_chapter, add_material_chapter_lesson, delete_material_chapter_lesson, reorder_material_structure, rename_material_structure
|
||||
from ..auth.decorators import require_role
|
||||
from ..services.cos_service import upload_file
|
||||
@@ -37,24 +38,60 @@ def create_new_material():
|
||||
material_id = create_material(teacher_id, material_name, description, chapters, image_url)
|
||||
return jsonify({"message": "教材创建成功", "material_id": material_id}), 201
|
||||
|
||||
@bp.route('/materials/<material_id>', methods=['GET'])
|
||||
@bp.route('/materials/<material_id>', methods=['GET', 'PUT', 'DELETE'])
|
||||
@require_role(roles="teacher")
|
||||
def get_material(material_id):
|
||||
if material_id is None:
|
||||
return jsonify({"message": "教材名称不能为空"}), 400
|
||||
material = load_material(material_id)
|
||||
print(material)
|
||||
return jsonify( material.model_dump()), 200
|
||||
def handle_material(material_id):
|
||||
|
||||
if request.method == 'GET':
|
||||
if material_id is None:
|
||||
return jsonify({"message": "教材名称不能为空"}), 400
|
||||
material = load_material(material_id)
|
||||
print(material)
|
||||
return jsonify(material.model_dump()), 200
|
||||
|
||||
@bp.route('/materials/<material_id>', methods=['PUT'])
|
||||
@require_role(roles="teacher")
|
||||
def update_existing_material(material_id):
|
||||
data = request.get_json()
|
||||
chapters = data.get('chapters')
|
||||
if update_material(material_id, chapters):
|
||||
return jsonify({"message": "教材更新成功"}), 200
|
||||
return jsonify({"message": "教材未找到"}), 404
|
||||
elif request.method == 'PUT':
|
||||
data = request.get_json()
|
||||
chapters = data.get('chapters')
|
||||
if update_material(material_id, chapters):
|
||||
return jsonify({"message": "教材更新成功"}), 200
|
||||
else:
|
||||
return jsonify({"message": "教材更新失败"}), 500
|
||||
|
||||
elif request.method == 'DELETE':
|
||||
# 获取当前教师信息
|
||||
teacher_uuid = session.get("user_uuid")
|
||||
teacher_id = current_app.extensions["uuid2username"][teacher_uuid]
|
||||
|
||||
# 检查材料是否存在,并且是否为当前教师创建
|
||||
mongo = current_app.extensions["mongo"]
|
||||
print(f"尝试删除课程ID: {material_id}, 当前教师ID: {teacher_id}")
|
||||
try:
|
||||
material = mongo.db.materials.find_one({'_id': ObjectId(material_id)})
|
||||
print(f"找到的材料: {material}")
|
||||
|
||||
if not material:
|
||||
return jsonify({"message": "课程不存在", "success": False}), 404
|
||||
|
||||
# 验证是否为当前教师创建的课程
|
||||
if material.get('teacher_id') != teacher_id:
|
||||
return jsonify({"message": "权限不足,无法删除他人课程", "success": False}), 403
|
||||
|
||||
except Exception as e:
|
||||
print(f"查询材料时出错: {e}")
|
||||
return jsonify({"message": f"查询课程时出错: {str(e)}", "success": False}), 500
|
||||
|
||||
# 执行删除操作
|
||||
try:
|
||||
result = mongo.db.materials.delete_one({'_id': ObjectId(material_id), 'teacher_id': teacher_id})
|
||||
print(f"删除操作结果: {result.deleted_count}")
|
||||
except Exception as e:
|
||||
print(f"删除材料时出错: {e}")
|
||||
return jsonify({"message": f"删除课程时出错: {str(e)}", "success": False}), 500
|
||||
|
||||
if result.deleted_count > 0:
|
||||
return jsonify({"message": "课程删除成功", "success": True}), 200
|
||||
else:
|
||||
return jsonify({"message": "删除失败", "success": False}), 500
|
||||
|
||||
@bp.route('/materials/addchapter/<material_id>', methods=['POST'])
|
||||
@require_role(roles="teacher")
|
||||
|
||||
@@ -69,45 +69,28 @@ def desktop(user_uuid, course_id, chapter_name, lesson_name):
|
||||
|
||||
|
||||
|
||||
chatmanager = ChatManager(restart=not load_history)
|
||||
restart = not load_history
|
||||
chatmanager = ChatManager(restart=restart)
|
||||
current_app.extensions["user_uuid2chatmanager"][user_uuid] = chatmanager
|
||||
|
||||
# 如果restart为True,删除mongo中的学习进度
|
||||
if restart:
|
||||
try:
|
||||
mongo = current_app.extensions["mongo"]
|
||||
mongo.db.learning_progress.delete_one({
|
||||
"user_id": user_id,
|
||||
"material_id": course_id,
|
||||
"chapter_name": chapter_name,
|
||||
"lesson_name": lesson_name
|
||||
})
|
||||
current_app.logger.info(f"删除学习进度成功: user_id={user_id}, course_id={course_id}, chapter={chapter_name}, lesson={lesson_name}")
|
||||
except Exception as e:
|
||||
current_app.logger.error(f"删除学习进度失败: {str(e)}")
|
||||
code_server_port = 10000 + int(uuid.uuid4().int % 10000)
|
||||
# chatmanager.start_code_server(user_uuid, user_id, path_dir, code_server_port)
|
||||
|
||||
|
||||
|
||||
caddy_conf = f"""
|
||||
handle_path /vsc{user_id}/* {{
|
||||
reverse_proxy localhost:{code_server_port}
|
||||
}}
|
||||
"""
|
||||
caddy_config_path = "/etc/caddy/Caddyfile"
|
||||
with open(caddy_config_path, "r") as f:
|
||||
lines = f.readlines()
|
||||
pattern = re.compile(
|
||||
r'handle_path\s+/vsc' + re.escape(user_id) + r'/\* {.*?reverse_proxy.*?}',
|
||||
re.DOTALL
|
||||
)
|
||||
for i in range(len(lines)):
|
||||
if (lines[i].strip()==''): lines[i]=''
|
||||
content = "".join(lines)
|
||||
if pattern.search(content):
|
||||
new_content = pattern.sub('', content)
|
||||
lines = new_content.splitlines(keepends=True)
|
||||
if len(lines) >= 2:
|
||||
insert_position = len(lines) - 2
|
||||
else:
|
||||
insert_position = len(lines)
|
||||
if caddy_conf[-1] not in ['\n', '\r']:
|
||||
caddy_conf += '\n'
|
||||
lines.insert(insert_position, caddy_conf)
|
||||
with open(caddy_config_path, "w") as f:
|
||||
f.writelines(lines)
|
||||
|
||||
try:
|
||||
subprocess.run(["sudo", "caddy", "reload", "--config", "/etc/caddy/Caddyfile"])
|
||||
except subprocess.CalledProcessError as e:
|
||||
print(f"Error reload caddy {e}")
|
||||
|
||||
cfg = current_app.config["VSCODE_WEB_PATH"]
|
||||
path_for_vscode = path_dir
|
||||
|
||||
@@ -5,7 +5,7 @@ api_key = sk-aMpnWklN2IbsK44d1kNpy6YOP9bk1pdPJjFeEmbb0a5ytEFf
|
||||
model=gpt-4.1-nano
|
||||
|
||||
[VSCODE_WEB]
|
||||
url = https://hsamooc.cn
|
||||
url = https://hsamooc.com
|
||||
[CODE_LIKE]
|
||||
url = /vsc-like
|
||||
#http://asengine.net:8282
|
||||
@@ -27,6 +27,6 @@ bucket = hsamooc-cdn-1374354408
|
||||
region = ap-guangzhou
|
||||
|
||||
[ASE_ENGINE]
|
||||
url = https://test.asengine.net
|
||||
namespace = /socket.io/7100eebf7a909e1ee3f4e06766f512f0358ecb6ac51d5434c17d31dd70890dc1
|
||||
url_token = 7100eebf7a909e1ee3f4e06766f512f0358ecb6ac51d5434c17d31dd70890dc1
|
||||
url = https://asengine.net
|
||||
namespace = /socket.io/afe58a9e4c03e10fae6fae5985e8adde23a49635
|
||||
url_token = afe58a9e4c03e10fae6fae5985e8adde23a49635
|
||||
|
||||
1
Html/db/data/user/_10235101560.json
Normal file
1
Html/db/data/user/_10235101560.json
Normal file
@@ -0,0 +1 @@
|
||||
{"username": "_10235101560"}
|
||||
1
Html/db/data/user/shanks.json
Normal file
1
Html/db/data/user/shanks.json
Normal file
@@ -0,0 +1 @@
|
||||
{"username": "shanks"}
|
||||
1
Html/db/data/user/ts88.json
Normal file
1
Html/db/data/user/ts88.json
Normal file
@@ -0,0 +1 @@
|
||||
{"username": "ts88"}
|
||||
1
Html/db/data/user/xuans.json
Normal file
1
Html/db/data/user/xuans.json
Normal file
@@ -0,0 +1 @@
|
||||
{"username": "xuans"}
|
||||
1
Html/db/data/user/xuans_.json
Normal file
1
Html/db/data/user/xuans_.json
Normal file
@@ -0,0 +1 @@
|
||||
{"username": "xuans_"}
|
||||
@@ -1,5 +1,209 @@
|
||||
import eventlet
|
||||
eventlet.monkey_patch() # 进行猴子补丁操作
|
||||
import logging
|
||||
|
||||
# 配置 eventlet 日志,抑制 IOClosed 等错误日志
|
||||
logging.getLogger('eventlet.hubs').setLevel(logging.CRITICAL)
|
||||
logging.getLogger('eventlet.greenio').setLevel(logging.CRITICAL)
|
||||
|
||||
# 进行猴子补丁操作
|
||||
eventlet.monkey_patch()
|
||||
|
||||
# 配置 eventlet 以更优雅地处理错误,避免疯狂报错
|
||||
try:
|
||||
import eventlet
|
||||
import traceback
|
||||
|
||||
# 1. 首先,禁用 eventlet 的调试日志,减少输出
|
||||
import logging
|
||||
logging.getLogger('eventlet').setLevel(logging.CRITICAL)
|
||||
logging.getLogger('socketio').setLevel(logging.CRITICAL)
|
||||
logging.getLogger('werkzeug').setLevel(logging.CRITICAL)
|
||||
|
||||
# 2. 配置 eventlet 相关设置(移除了不存在的debug属性)
|
||||
|
||||
# 3. 避免重复打印相同错误的机制
|
||||
seen_errors = set()
|
||||
max_error_logs = 5 # 每个错误最多打印5次
|
||||
error_counts = {}
|
||||
|
||||
def is_duplicate_error(e):
|
||||
"""检查是否为重复错误"""
|
||||
error_key = f"{type(e).__name__}: {e}"
|
||||
if error_key in seen_errors:
|
||||
error_counts[error_key] = error_counts.get(error_key, 0) + 1
|
||||
if error_counts[error_key] > max_error_logs:
|
||||
return True
|
||||
else:
|
||||
seen_errors.add(error_key)
|
||||
error_counts[error_key] = 1
|
||||
return False
|
||||
|
||||
# 4. 只修改关键的 greenio 方法,确保在致命错误时彻底关闭连接
|
||||
# 增强 socketio 错误处理,确保不会因为单个连接错误而宕机
|
||||
try:
|
||||
from flask_socketio import SocketIO
|
||||
# 获取当前 socketio 实例并配置错误处理
|
||||
import sys
|
||||
original_excepthook = sys.excepthook
|
||||
|
||||
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 错误,不导致服务器宕机
|
||||
if not is_duplicate_error(exc_value):
|
||||
print(f"[Global Error Handler] {exc_type.__name__}: {exc_value}")
|
||||
print("[Traceback]")
|
||||
traceback.print_exception(exc_type, exc_value, exc_traceback)
|
||||
# 不调用原始的 excepthook,防止服务器宕机
|
||||
return
|
||||
# 其他异常调用原始的 excepthook
|
||||
original_excepthook(exc_type, exc_value, exc_traceback)
|
||||
|
||||
# 设置全局异常钩子
|
||||
sys.excepthook = custom_excepthook
|
||||
except Exception as e:
|
||||
# 如果修改失败,忽略错误
|
||||
print(f"[Global Excepthook Patch Error] {e}")
|
||||
from eventlet import greenio
|
||||
|
||||
# 保存并替换原始的 greenio 方法
|
||||
if hasattr(greenio.base.GreenSocket, '_recv_loop'):
|
||||
original_recv_loop = greenio.base.GreenSocket._recv_loop
|
||||
|
||||
def custom_recv_loop(self, recv_func, recv_args, *args, **kwargs):
|
||||
try:
|
||||
return original_recv_loop(self, recv_func, recv_args, *args, **kwargs)
|
||||
except Exception as e:
|
||||
if not is_duplicate_error(e):
|
||||
print(f"[Eventlet IO Error] _recv_loop: {type(e).__name__}: {e}")
|
||||
print("[Traceback]")
|
||||
traceback.print_exc()
|
||||
# 彻底关闭连接,不再继续处理
|
||||
try:
|
||||
self.close()
|
||||
except Exception:
|
||||
pass
|
||||
return b''
|
||||
|
||||
greenio.base.GreenSocket._recv_loop = custom_recv_loop
|
||||
|
||||
if hasattr(greenio.base.GreenSocket, 'recv_into'):
|
||||
original_recv_into = greenio.base.GreenSocket.recv_into
|
||||
|
||||
def custom_recv_into(self, buffer, nbytes=0, flags=0):
|
||||
try:
|
||||
return original_recv_into(self, buffer, nbytes, flags)
|
||||
except Exception as e:
|
||||
if not is_duplicate_error(e):
|
||||
print(f"[Eventlet IO Error] recv_into: {type(e).__name__}: {e}")
|
||||
print("[Traceback]")
|
||||
traceback.print_exc()
|
||||
# 彻底关闭连接,不再继续处理
|
||||
try:
|
||||
self.close()
|
||||
except Exception:
|
||||
pass
|
||||
return 0
|
||||
|
||||
greenio.base.GreenSocket.recv_into = custom_recv_into
|
||||
|
||||
if hasattr(greenio.base.GreenSocket, '_send_loop'):
|
||||
original_send_loop = greenio.base.GreenSocket._send_loop
|
||||
|
||||
def custom_send_loop(self, send_func, data, *args, **kwargs):
|
||||
try:
|
||||
return original_send_loop(self, send_func, data, *args, **kwargs)
|
||||
except Exception as e:
|
||||
if not is_duplicate_error(e):
|
||||
print(f"[Eventlet IO Error] _send_loop: {type(e).__name__}: {e}")
|
||||
print("[Traceback]")
|
||||
traceback.print_exc()
|
||||
# 彻底关闭连接,不再继续处理
|
||||
try:
|
||||
self.close()
|
||||
except Exception:
|
||||
pass
|
||||
return 0
|
||||
|
||||
greenio.base.GreenSocket._send_loop = custom_send_loop
|
||||
|
||||
if hasattr(greenio.base.GreenSocket, 'send'):
|
||||
original_send = greenio.base.GreenSocket.send
|
||||
|
||||
def custom_send(self, data, flags=0):
|
||||
try:
|
||||
return original_send(self, data, flags)
|
||||
except Exception as e:
|
||||
if not is_duplicate_error(e):
|
||||
print(f"[Eventlet IO Error] send: {type(e).__name__}: {e}")
|
||||
print("[Traceback]")
|
||||
traceback.print_exc()
|
||||
# 彻底关闭连接,不再继续处理
|
||||
try:
|
||||
self.close()
|
||||
except Exception:
|
||||
pass
|
||||
return 0
|
||||
|
||||
greenio.base.GreenSocket.send = custom_send
|
||||
|
||||
# 5. 处理 WSGI 中的错误,确保彻底清理
|
||||
try:
|
||||
import eventlet.wsgi
|
||||
|
||||
if hasattr(eventlet.wsgi.HttpProtocol, 'handle_one_request'):
|
||||
original_wsgi_handle_one_request = eventlet.wsgi.HttpProtocol.handle_one_request
|
||||
|
||||
def custom_wsgi_handle_one_request(self):
|
||||
try:
|
||||
return original_wsgi_handle_one_request(self)
|
||||
except Exception as e:
|
||||
if not is_duplicate_error(e):
|
||||
print(f"[Eventlet WSGI Request Error] {type(e).__name__}: {e}")
|
||||
print("[Traceback]")
|
||||
traceback.print_exc()
|
||||
# 彻底清理连接,不再继续
|
||||
try:
|
||||
self.rfile.close()
|
||||
self.wfile.close()
|
||||
self.finish()
|
||||
except Exception:
|
||||
pass
|
||||
return
|
||||
|
||||
eventlet.wsgi.HttpProtocol.handle_one_request = custom_wsgi_handle_one_request
|
||||
|
||||
if hasattr(eventlet.wsgi.HttpProtocol, 'handle_one_response'):
|
||||
original_wsgi_handle_one_response = eventlet.wsgi.HttpProtocol.handle_one_response
|
||||
|
||||
def custom_wsgi_handle_one_response(self):
|
||||
try:
|
||||
return original_wsgi_handle_one_response(self)
|
||||
except Exception as e:
|
||||
if not is_duplicate_error(e):
|
||||
print(f"[Eventlet WSGI Response Error] {type(e).__name__}: {e}")
|
||||
print("[Traceback]")
|
||||
traceback.print_exc()
|
||||
# 彻底清理连接,不再继续
|
||||
try:
|
||||
self.rfile.close()
|
||||
self.wfile.close()
|
||||
self.finish()
|
||||
except Exception:
|
||||
pass
|
||||
return
|
||||
|
||||
eventlet.wsgi.HttpProtocol.handle_one_response = custom_wsgi_handle_one_response
|
||||
except Exception as e:
|
||||
# 如果修改失败,忽略错误
|
||||
print(f"[WSGI Patch Error] {e}")
|
||||
|
||||
print("[Eventlet Error Handling] Configured to handle errors gracefully, avoiding duplicate logs")
|
||||
except Exception as e:
|
||||
# 如果修改失败,打印错误但继续运行
|
||||
print(f"[Eventlet Patch Initialization Error] {e}")
|
||||
traceback.print_exc()
|
||||
|
||||
from flask import Flask
|
||||
from .views.routes import main_bp
|
||||
from .views.file import file_bp
|
||||
|
||||
@@ -13,4 +13,5 @@ class Config:
|
||||
|
||||
# 自定义其他全局配置
|
||||
ROOT_WORKSPACE_PATH = GLOBAL_CONFIG['Global']['ROOT_WORKSPACE_PATH']
|
||||
DEBUG = GLOBAL_CONFIG['Global'].getboolean('DEBUG', False)
|
||||
|
||||
|
||||
@@ -3,12 +3,12 @@ from flask_socketio import SocketIO
|
||||
from .config import Config
|
||||
# 初始化扩展
|
||||
cors = CORS()
|
||||
socketio = SocketIO(path='vsc-like-ws',cors_allowed_origins="*",max_payload_size=5242880, async_mode="eventlet") # 不直接传 app
|
||||
socketio = SocketIO(path='vsc-like-ws',cors_allowed_origins="*",max_payload_size=5242880, async_mode="eventlet",always_connect=False) # 不直接传 app
|
||||
|
||||
session_paths = {}
|
||||
def init_extensions(app):
|
||||
cors.init_app(app, resources={r"/*": {"origins": "*"}}, supports_credentials=True)
|
||||
socketio.init_app(app, cors_allowed_origins="*", max_payload_size=5242880, async_mode="eventlet")
|
||||
socketio.init_app(app, cors_allowed_origins="*", max_payload_size=5242880, async_mode="eventlet",always_connect=False)
|
||||
app.extensions["session_paths"] = session_paths
|
||||
|
||||
def register_namespaces(app):
|
||||
|
||||
@@ -29,53 +29,122 @@ terminal_bp = Blueprint('terminal', __name__, url_prefix='/vsc-like')
|
||||
|
||||
|
||||
def set_winsize(fd, row, col, xpix=0, ypix=0):
|
||||
winsize = struct.pack("HHHH", row, col, xpix, ypix)
|
||||
fcntl.ioctl(fd, termios.TIOCSWINSZ, winsize)
|
||||
try:
|
||||
winsize = struct.pack("HHHH", row, col, xpix, ypix)
|
||||
fcntl.ioctl(fd, termios.TIOCSWINSZ, winsize)
|
||||
except (OSError, IOError):
|
||||
# File descriptor closed or invalid, do nothing
|
||||
pass
|
||||
|
||||
|
||||
def read_and_forward_pty_output(fd=None, pid=None, room_id=None,namespace=None):
|
||||
def read_and_forward_pty_output(fd=None, pid=None, room_id=None, namespace=None):
|
||||
"""
|
||||
read data on pty master from the pty slave, and emit to the web terminal visitor
|
||||
"""
|
||||
max_read_bytes = 1024 * 20
|
||||
timeout=0.1
|
||||
while True:
|
||||
socketio.sleep(timeout)
|
||||
timeout=min(timeout*2, 0.4)
|
||||
# using flask default web server, or uwsgi production web server
|
||||
# when the child process is terminated, it will not disappear from linux process list
|
||||
# and keep staying as a zombie process until the parent exits.
|
||||
try:
|
||||
child_process = psutil.Process(pid)
|
||||
except psutil.NoSuchProcess as err:
|
||||
return
|
||||
if child_process.status() not in ('running', 'sleeping'):
|
||||
return
|
||||
if fd:
|
||||
timeout_sec = 0
|
||||
(data_ready, _, _) = select.select([fd], [], [], timeout_sec)
|
||||
if data_ready:
|
||||
# output = os.read(fd, max_read_bytes).decode('ascii')
|
||||
timeout=0.1
|
||||
# 初始超时时间设置为较短值,确保响应迅速
|
||||
timeout = 0.05
|
||||
# 最大超时时间,避免太频繁的检查
|
||||
max_timeout = 0.5
|
||||
# 成功读取数据后的重置超时时间
|
||||
reset_timeout = 0.05
|
||||
|
||||
try:
|
||||
while True:
|
||||
# 等待一段时间,减少CPU占用
|
||||
socketio.sleep(timeout)
|
||||
|
||||
# 使用指数退避算法调整超时时间,但不超过最大值
|
||||
timeout = min(timeout * 1.5, max_timeout)
|
||||
|
||||
# 检查子进程状态
|
||||
try:
|
||||
child_process = psutil.Process(pid)
|
||||
except psutil.NoSuchProcess:
|
||||
# 进程已终止,清理僵尸进程
|
||||
try:
|
||||
output = os.read(fd, max_read_bytes).decode()
|
||||
except Exception as err:
|
||||
output = """
|
||||
***AQUI WEB TERM ERR***
|
||||
{}
|
||||
***********************
|
||||
""".format(err)
|
||||
# the key for different visitor to get different terminal (instead of mixing up)
|
||||
# is to let the background task push pty response to each one's own (default) ROOM!
|
||||
namespace.emit("pty_output", {"output": output}, room=room_id)
|
||||
os.waitpid(pid, os.WNOHANG)
|
||||
except Exception:
|
||||
pass
|
||||
return
|
||||
|
||||
# 检查进程状态,如果不是运行或睡眠状态,则退出
|
||||
if child_process.status() not in ('running', 'sleeping'):
|
||||
try:
|
||||
# 等待进程终止
|
||||
child_process.wait(timeout=1)
|
||||
except Exception:
|
||||
try:
|
||||
os.waitpid(pid, os.WNOHANG)
|
||||
except Exception:
|
||||
pass
|
||||
return
|
||||
|
||||
# 如果文件描述符有效,尝试读取数据
|
||||
if fd:
|
||||
try:
|
||||
# 使用非阻塞select检查是否有数据可读
|
||||
(data_ready, _, _) = select.select([fd], [], [], 0)
|
||||
if data_ready:
|
||||
# 有数据可读,重置超时时间
|
||||
timeout = reset_timeout
|
||||
try:
|
||||
# 读取数据
|
||||
output = os.read(fd, max_read_bytes).decode()
|
||||
except (OSError, IOError, EOFError):
|
||||
# 文件描述符已关闭或其他IO错误,优雅退出
|
||||
return
|
||||
except UnicodeDecodeError as err:
|
||||
# 处理编码错误
|
||||
output = f"""
|
||||
***AQUI WEB TERM ERR***
|
||||
Unicode decode error: {err}
|
||||
***********************
|
||||
"""
|
||||
|
||||
# 发送数据到客户端
|
||||
try:
|
||||
namespace.emit("pty_output", {"output": output}, room=room_id)
|
||||
except Exception:
|
||||
# 如果发送失败,客户端可能已断开连接,退出
|
||||
return
|
||||
except (OSError, IOError):
|
||||
# 文件描述符无效,优雅退出
|
||||
return
|
||||
except Exception as e:
|
||||
# 捕获任何其他未预期的异常,防止服务器崩溃
|
||||
current_app.logger.error(f"Unexpected error in read_and_forward_pty_output: {e}")
|
||||
finally:
|
||||
# 清理文件描述符
|
||||
if fd:
|
||||
try:
|
||||
os.close(fd)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
class VSCLikeNameSpace(Namespace):
|
||||
def on_connect(self):
|
||||
"""new client connected"""
|
||||
if session.get('terminal_config', {}).get('child_pid', None):
|
||||
print(session['terminal_config']['child_pid'])
|
||||
# already started child process, don't start another
|
||||
return
|
||||
# 确保terminal_config存在于session中
|
||||
if 'terminal_config' not in session:
|
||||
session['terminal_config'] = TERM_INIT_CONFIG.copy()
|
||||
session.modified = True
|
||||
|
||||
terminal_config = session['terminal_config']
|
||||
|
||||
# 检查是否已经有运行中的子进程
|
||||
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()
|
||||
@@ -84,87 +153,210 @@ class VSCLikeNameSpace(Namespace):
|
||||
# this is the child process fork.
|
||||
# anything printed here will show up in the pty, including the output
|
||||
# of this subprocess
|
||||
# subprocess.run('bash')
|
||||
term_type = session.get('terminal_config').get('term_type')
|
||||
path = TERM_INIT_CONFIG.get('client_path', {}).get(term_type, None)
|
||||
if not path:
|
||||
print("Can't locate {} binary, exit".format(term_type))
|
||||
disconnect()
|
||||
if term_type == 'telnet':
|
||||
# switch to the right location of your telnet binary (example comes from OSX which got telnet from brew)
|
||||
# or you can also make work like auto-detection, or manually but configurable
|
||||
os.execl(path, 'telnet', '-l', session['terminal_config']['username'],
|
||||
session['terminal_config']['domain'], '{}'.format(session['terminal_config']['port']))
|
||||
elif term_type == 'ssh':
|
||||
os.execl(path,'ssh', '-p','22',
|
||||
#'{}'.format(session['terminal_config']['port']),
|
||||
'{}@{}'.format(session['terminal_config']['username'], session['terminal_config']['domain']))
|
||||
try:
|
||||
# 获取终端配置
|
||||
terminal_config = session.get('terminal_config', {})
|
||||
term_type = terminal_config.get('term_type')
|
||||
|
||||
if not term_type:
|
||||
print("Terminal type not specified, exit")
|
||||
os._exit(1)
|
||||
|
||||
else:
|
||||
current_app.logger.debug("wrong term type {}".format(term_type))
|
||||
disconnect()
|
||||
session['terminal_config'] = TERM_INIT_CONFIG
|
||||
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))
|
||||
os._exit(1)
|
||||
|
||||
# 获取连接参数
|
||||
username = terminal_config.get('username')
|
||||
domain = terminal_config.get('domain', TERM_INIT_CONFIG['domain'])
|
||||
port = terminal_config.get('port')
|
||||
|
||||
if not username or not domain:
|
||||
print("Missing required connection parameters, exit")
|
||||
os._exit(1)
|
||||
|
||||
if term_type == 'telnet':
|
||||
# 使用telnet连接
|
||||
if not port:
|
||||
print("Port not specified for telnet, exit")
|
||||
os._exit(1)
|
||||
os.execl(path, 'telnet', '-l', username, domain, str(port))
|
||||
elif term_type == 'ssh':
|
||||
# 使用ssh连接
|
||||
ssh_port = port if port else 22 # 默认端口22
|
||||
os.execl(path, 'ssh', '-p', str(ssh_port), '{}@{}'.format(username, domain))
|
||||
else:
|
||||
print("Wrong term type {}, exit".format(term_type))
|
||||
os._exit(1)
|
||||
except Exception as e:
|
||||
print("Error in child process: {}", str(e))
|
||||
os._exit(1)
|
||||
else:
|
||||
session['terminal_config']['fd'] = fd
|
||||
session['terminal_config']['child_pid'] = child_pid
|
||||
session['terminal_config']['room_id'] = rooms()[0]
|
||||
# 更新会话配置
|
||||
terminal_config['fd'] = fd
|
||||
terminal_config['child_pid'] = child_pid
|
||||
terminal_config['room_id'] = rooms()[0]
|
||||
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()))
|
||||
socketio.start_background_task(read_and_forward_pty_output, fd, child_pid, rooms()[0],self)
|
||||
|
||||
# 启动后台任务读取pty输出
|
||||
socketio.start_background_task(read_and_forward_pty_output, fd, child_pid, rooms()[0], self)
|
||||
current_app.logger.debug("background task running")
|
||||
# print(session)
|
||||
|
||||
def on_pty_input(self, data):
|
||||
"""write to the child pty, which now is the ssh process from this machine to the 'domain' configured
|
||||
"""
|
||||
print(f"get data {data}")
|
||||
# 输入验证
|
||||
if not isinstance(data, dict):
|
||||
current_app.logger.error("Invalid input format: expected dictionary")
|
||||
return
|
||||
|
||||
input_data = data.get("input")
|
||||
if not isinstance(input_data, str):
|
||||
current_app.logger.error("Invalid input data: expected string")
|
||||
return
|
||||
|
||||
# 限制输入长度,防止缓冲区溢出
|
||||
if len(input_data) > 1024:
|
||||
input_data = input_data[:1024]
|
||||
current_app.logger.warning("Input truncated due to length")
|
||||
|
||||
try:
|
||||
child_process = psutil.Process(session.get('terminal_config').get('child_pid'))
|
||||
except psutil.NoSuchProcess as err:
|
||||
disconnect()
|
||||
session['terminal_config'] = TERM_INIT_CONFIG
|
||||
return
|
||||
if child_process.status() not in ('running', 'sleeping'):
|
||||
disconnect()
|
||||
session['terminal_config'] = TERM_INIT_CONFIG
|
||||
return
|
||||
# print(session)
|
||||
# print(data, 'from input')
|
||||
fd = session.get('terminal_config').get('fd')
|
||||
if fd:
|
||||
# print("writing to ptd: %s" % data["input"])
|
||||
# os.write(fd, data["input"].encode('ascii'))
|
||||
os.write(fd, data["input"].encode())
|
||||
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
|
||||
|
||||
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
|
||||
|
||||
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
|
||||
except Exception as e:
|
||||
current_app.logger.error(f"Error in pty_input handling: {e}")
|
||||
|
||||
|
||||
def on_resize(self, data):
|
||||
# 输入验证
|
||||
if not isinstance(data, dict):
|
||||
current_app.logger.error("Invalid resize data format: expected dictionary")
|
||||
return
|
||||
|
||||
rows = data.get("rows")
|
||||
cols = data.get("cols")
|
||||
|
||||
# 验证行和列的值是否为正整数
|
||||
if not (isinstance(rows, int) and isinstance(cols, int)):
|
||||
current_app.logger.error("Invalid resize dimensions: expected integers")
|
||||
return
|
||||
|
||||
# 限制窗口大小范围,防止异常值
|
||||
if rows <= 0 or rows > 1000 or cols <= 0 or cols > 1000:
|
||||
current_app.logger.error(f"Invalid resize dimensions: {rows}x{cols} (out of range)")
|
||||
return
|
||||
|
||||
try:
|
||||
child_process = psutil.Process(session.get('terminal_config').get('child_pid'))
|
||||
except psutil.NoSuchProcess as err:
|
||||
disconnect()
|
||||
session['terminal_config'] = TERM_INIT_CONFIG
|
||||
return
|
||||
if child_process.status() not in ('running', 'sleeping'):
|
||||
disconnect()
|
||||
session['terminal_config'] = TERM_INIT_CONFIG
|
||||
return
|
||||
fd = session.get('terminal_config').get('fd')
|
||||
if fd:
|
||||
set_winsize(fd, data["rows"], data["cols"])
|
||||
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
|
||||
|
||||
# 检查子进程是否存在且运行中
|
||||
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
|
||||
|
||||
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
|
||||
except Exception as e:
|
||||
current_app.logger.error(f"Error in resize handling: {e}")
|
||||
|
||||
def on_disconnect(self):
|
||||
try:
|
||||
child_process = psutil.Process(session.get('terminal_config', {}).get('child_pid'))
|
||||
except psutil.NoSuchProcess as err:
|
||||
disconnect()
|
||||
session['terminal_config'] = TERM_INIT_CONFIG
|
||||
return
|
||||
if child_process.status() in ('running', 'sleeping'):
|
||||
# if visitor just close the browser tab then left alone the pty here
|
||||
# it should be terminated by the parent process after
|
||||
child_process.terminate()
|
||||
current_app.logger.debug('user left the pty alone, terminated')
|
||||
terminal_config = session.get('terminal_config', {})
|
||||
child_pid = terminal_config.get('child_pid')
|
||||
fd = terminal_config.get('fd')
|
||||
|
||||
# 先关闭文件描述符,避免其他操作尝试使用无效的文件描述符
|
||||
if fd:
|
||||
try:
|
||||
os.close(fd)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
if child_pid:
|
||||
try:
|
||||
child_process = psutil.Process(child_pid)
|
||||
if child_process.status() in ('running', 'sleeping'):
|
||||
# if visitor just close the browser tab then left alone the pty here
|
||||
# it should be terminated by the parent process after
|
||||
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:
|
||||
# Process already terminated, try to wait anyway to clean up any zombie
|
||||
try:
|
||||
os.waitpid(child_pid, os.WNOHANG)
|
||||
except Exception:
|
||||
pass
|
||||
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
|
||||
except Exception as err:
|
||||
current_app.logger.error(f'Error terminating process: {err}')
|
||||
|
||||
# Reset session config
|
||||
session['terminal_config'] = TERM_INIT_CONFIG
|
||||
current_app.logger.debug('Client disconnected')
|
||||
@@ -1,5 +1,5 @@
|
||||
import os
|
||||
import subprocess
|
||||
from eventlet.green import subprocess
|
||||
from flask import Blueprint, request, jsonify, current_app, render_template, session
|
||||
from ..services.file_service import get_file_tree, load_config
|
||||
|
||||
@@ -42,32 +42,34 @@ def vsc_like(user_uuid, user_id, course_id, chapter_name, lesson_name, port):
|
||||
subprocess.run(["sudo", "chown", "-R", user_id, user_root]) # 设置目录权限为新用户
|
||||
|
||||
except subprocess.CalledProcessError as e:
|
||||
print(f"Error creating user {user_id}: {e}")
|
||||
# 用户可能已经存在,这是正常情况,继续执行
|
||||
print(f"Useradd command returned non-zero exit status, this is expected if user already exists: {e}")
|
||||
try:
|
||||
# 使用 sudo 执行 mkdir 命令来创建目录
|
||||
subprocess.run(["sudo", "-u", user_id, "mkdir", "-p", path], check=True)
|
||||
subprocess.run(["sudo", "-u", user_id, "mkdir", "-p", f'{user_root}/.ssh'], check=True)
|
||||
subprocess.run(["sudo", "-u", user_id, "mkdir", "-p", path], check=current_app.config['DEBUG'])
|
||||
subprocess.run(["sudo", "-u", user_id, "mkdir", "-p", f'{user_root}/.ssh'], check=current_app.config['DEBUG'])
|
||||
flask_pub_key = "/home/flask/.ssh/id_ed25519.pub"
|
||||
subprocess.run(["sudo", "cp", flask_pub_key, f"{user_root}/.ssh/authorized_keys"], check=True)
|
||||
subprocess.run(["sudo", "chmod", "700", f"{user_root}/.ssh"], check=True)
|
||||
subprocess.run(["sudo", "chmod", "600", f"{user_root}/.ssh/authorized_keys"], check=True)
|
||||
subprocess.run(["sudo", "cp", flask_pub_key, f"{user_root}/.ssh/authorized_keys"], check=current_app.config['DEBUG'])
|
||||
subprocess.run(["sudo", "chmod", "700", f"{user_root}/.ssh"], check=current_app.config['DEBUG'])
|
||||
subprocess.run(["sudo", "chmod", "600", f"{user_root}/.ssh/authorized_keys"], check=current_app.config['DEBUG'])
|
||||
print(f"Directory {path} created successfully for user {user_id}")
|
||||
except subprocess.CalledProcessError as e:
|
||||
print(f"Error creating directory {path} details {str(e)}")
|
||||
try:#使用sudo创建shared_group
|
||||
subprocess.run(["sudo", "groupadd", f"shared_group_{user_id}"], check=True)
|
||||
subprocess.run(["sudo", "groupadd", f"shared_group_{user_id}"], check=current_app.config['DEBUG'])
|
||||
except subprocess.CalledProcessError as e:
|
||||
print(f"Error creating shared_group: {e}")
|
||||
# 组可能已经存在,这是正常情况,继续执行
|
||||
print(f"Groupadd command returned non-zero exit status, this is expected if group already exists: {e}")
|
||||
try:#使用sudo将user_id加入shared_group
|
||||
subprocess.run(["sudo", "usermod", "-a", "-G", f"shared_group_{user_id}", user_id], check=True)
|
||||
subprocess.run(["sudo", "usermod", "-a", "-G", f"shared_group_{user_id}", user_id], check=current_app.config['DEBUG'])
|
||||
# 自己也加入
|
||||
subprocess.run(["sudo", "usermod", "-a", "-G", f"shared_group_{user_id}", 'flask'], check=True)
|
||||
subprocess.run(["sudo", "usermod", "-a", "-G", f"shared_group_{user_id}", 'flask'], check=current_app.config['DEBUG'])
|
||||
except subprocess.CalledProcessError as e:
|
||||
print(f"Error adding user {user_id} to shared_group: {e}")
|
||||
try:
|
||||
subprocess.run(["sudo", "chown", "-R", f"flask:shared_group_{user_id}", path], check=True)
|
||||
subprocess.run(["sudo", "chmod", "-R", "755", user_root], check=True)
|
||||
subprocess.run(["sudo", "chmod", "-R", "775", path], check=True)
|
||||
subprocess.run(["sudo", "chown", "-R", f"flask:shared_group_{user_id}", path], check=current_app.config['DEBUG'])
|
||||
subprocess.run(["sudo", "chmod", "-R", "755", user_root], check=current_app.config['DEBUG'])
|
||||
subprocess.run(["sudo", "chmod", "-R", "775", path], check=current_app.config['DEBUG'])
|
||||
except subprocess.CalledProcessError as e:
|
||||
print(f"Error changing directory {path} to shared_group_{user_id}: {e}")
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
[Global]
|
||||
SECRET_KEY = cakebaker
|
||||
ROOT_WORKSPACE_PATH = /home
|
||||
DEBUG = False
|
||||
|
||||
@@ -1,5 +1,12 @@
|
||||
from app import create_app
|
||||
from app.extensions import socketio
|
||||
import logging
|
||||
|
||||
# 配置日志,减少eventlet的调试日志
|
||||
logging.getLogger('eventlet').setLevel(logging.ERROR)
|
||||
logging.getLogger('socketio').setLevel(logging.ERROR)
|
||||
logging.getLogger('werkzeug').setLevel(logging.ERROR)
|
||||
|
||||
app = create_app()
|
||||
|
||||
if __name__ == '__main__':
|
||||
@@ -9,4 +16,5 @@ if __name__ == '__main__':
|
||||
port=5200,
|
||||
debug=False, # 开发期打开
|
||||
allow_unsafe_werkzeug=True, # 避免 dev server 的安全限制提示
|
||||
)
|
||||
log_output=False # 禁用详细输出
|
||||
)
|
||||
|
||||
@@ -4,17 +4,17 @@
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>Cloud IDE</title>
|
||||
<link rel="stylesheet" href="static/cdnback/css/editor/editor.main.css">
|
||||
<script src="static/cdnback/socket.io.min.js"></script>
|
||||
<link rel="stylesheet" href="static/cdnback/all.min.css">
|
||||
<link rel="stylesheet" href="static/cdnback/css/xterm.css" />
|
||||
<link rel="stylesheet" href="/static/cdnback/css/editor/editor.main.css">
|
||||
<script src="/static/cdnback/socket.io.min.js"></script>
|
||||
<link rel="stylesheet" href="/static/cdnback/all.min.css">
|
||||
<link rel="stylesheet" href="/static/cdnback/css/xterm.css" />
|
||||
<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/xterm/5.5.0/xterm.js"></script> -->
|
||||
<script src="static/cdnback/js/xterm.js"></script>
|
||||
<script src="static/cdnback/js/addons/fit/fit.js"></script>
|
||||
<script src="static/cdnback/js/addons/webLinks/webLinks.js"></script>
|
||||
<script src="static/cdnback/js/addons/fullscreen/fullscreen.js"></script>
|
||||
<script src="static/cdnback/js/addons/search/search.js"></script>
|
||||
<link rel="stylesheet" href="static/cdnback/all.min.css">
|
||||
<script src="/static/cdnback/js/xterm.js"></script>
|
||||
<script src="/static/cdnback/js/addons/fit/fit.js"></script>
|
||||
<script src="/static/cdnback/js/addons/webLinks/webLinks.js"></script>
|
||||
<script src="/static/cdnback/js/addons/fullscreen/fullscreen.js"></script>
|
||||
<script src="/static/cdnback/js/addons/search/search.js"></script>
|
||||
<link rel="stylesheet" href="/static/cdnback/all.min.css">
|
||||
|
||||
<link rel="stylesheet" href="/vsc-like/static/css/index.css">
|
||||
<link rel="stylesheet" href="/vsc-like/static/css/notification.css">
|
||||
@@ -61,7 +61,7 @@
|
||||
</div>
|
||||
<div id="notificationsContainer"></div>
|
||||
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs/loader.js"></script>
|
||||
<script src="/static/cdnback/js/monaco-editor/0.34.0/min/vs/loader.js"></script>
|
||||
<script src="/vsc-like/static/js/code-like-extension.js"></script>
|
||||
<script src="/vsc-like/static/js/file.js"></script>
|
||||
<script src="/vsc-like/static/js/terminal.js"></script>
|
||||
@@ -161,7 +161,7 @@
|
||||
// saveFile
|
||||
if (saveTimeout) clearTimeout(saveTimeout);
|
||||
saveTimeout = setTimeout(() => {
|
||||
postSaveFile(selectedItem.path+'/'+selectedItem.name, editor.getValue());
|
||||
postSaveFile(filePath, editor.getValue());
|
||||
}, 5000); // 5000ms = 5秒
|
||||
});
|
||||
|
||||
|
||||
69
et --hard HEAD@{1}
Normal file
69
et --hard HEAD@{1}
Normal file
@@ -0,0 +1,69 @@
|
||||
[33m68493d6a[m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mmain[m[33m, [m[1;31morigin/main[m[33m)[m HEAD@{0}: pull origin main: Fast-forward
|
||||
[33m0852e121[m HEAD@{1}: reset: moving to HEAD
|
||||
[33m0852e121[m HEAD@{2}: commit: cdn fix more
|
||||
[33m7dc4714a[m HEAD@{3}: commit: index style
|
||||
[33m9dc81b14[m[33m ([m[1;31morigin/feature/paste_detecte_new[m[33m, [m[1;32mfeature/paste_detecte_new[m[33m)[m HEAD@{4}: merge feature/paste_detecte_new: Fast-forward
|
||||
[33m7862647b[m HEAD@{5}: checkout: moving from feature/paste_detecte_new to main
|
||||
[33m9dc81b14[m[33m ([m[1;31morigin/feature/paste_detecte_new[m[33m, [m[1;32mfeature/paste_detecte_new[m[33m)[m HEAD@{6}: commit (merge): Merge branch 'main' into feature/paste_detecte_new
|
||||
[33m0cf1896b[m HEAD@{7}: checkout: moving from main to feature/paste_detecte_new
|
||||
[33m7862647b[m HEAD@{8}: commit: style fix
|
||||
[33m6b9c8e9e[m HEAD@{9}: commit: cdn change to local and use markdown and style change
|
||||
[33m33844786[m HEAD@{10}: commit: use markdown to edit
|
||||
[33mce88ae64[m HEAD@{11}: commit: use queue to allow send vscode_ws when it is none
|
||||
[33m6c38e906[m HEAD@{12}: pull: Fast-forward
|
||||
[33m9759c93a[m HEAD@{13}: commit: fix funciton response
|
||||
[33mecf19f49[m HEAD@{14}: commit: fix function double promlem
|
||||
[33mf5d50772[m HEAD@{15}: commit: function call can be expire
|
||||
[33m4a390adb[m HEAD@{16}: commit: fix style bug
|
||||
[33m960d1f1d[m HEAD@{17}: commit: style fix
|
||||
[33mc73ea447[m HEAD@{18}: commit: fix index
|
||||
[33m33bf569f[m HEAD@{19}: commit: fix nextchapter bug
|
||||
[33mb921bda4[m HEAD@{20}: commit: auto get domain
|
||||
[33m9921848d[m HEAD@{21}: commit: remove prefix of http url
|
||||
[33m4d81aef8[m HEAD@{22}: commit (merge): Merge branch 'feature/paste_deteced'
|
||||
[33m8fe5ee16[m HEAD@{23}: checkout: moving from feature/paste_deteced to main
|
||||
[33m9ce212e9[m[33m ([m[1;31morigin/feature/paste_deteced[m[33m, [m[1;32mfeature/paste_deteced[m[33m)[m HEAD@{24}: checkout: moving from main to feature/paste_deteced
|
||||
[33m8fe5ee16[m HEAD@{25}: commit (merge): 准备合并main
|
||||
[33m908d5915[m HEAD@{26}: checkout: moving from syt to main
|
||||
[33m57d8ac32[m[33m ([m[1;31morigin/syt[m[33m, [m[1;32msyt[m[33m)[m HEAD@{27}: checkout: moving from main to syt
|
||||
[33m908d5915[m HEAD@{28}: commit: ready
|
||||
[33m02b12791[m HEAD@{29}: checkout: moving from syt to main
|
||||
[33m57d8ac32[m[33m ([m[1;31morigin/syt[m[33m, [m[1;32msyt[m[33m)[m HEAD@{30}: checkout: moving from main to syt
|
||||
[33m02b12791[m HEAD@{31}: pull: Fast-forward
|
||||
[33m7d861e34[m[33m ([m[1;31morigin/zrz[m[33m)[m HEAD@{32}: checkout: moving from syt to main
|
||||
[33m57d8ac32[m[33m ([m[1;31morigin/syt[m[33m, [m[1;32msyt[m[33m)[m HEAD@{33}: commit: first
|
||||
[33m0196f37e[m HEAD@{34}: pull: Merge made by the 'ort' strategy.
|
||||
[33m57eb1197[m HEAD@{35}: commit: ok
|
||||
[33m382f2006[m HEAD@{36}: checkout: moving from main to syt
|
||||
[33m7d861e34[m[33m ([m[1;31morigin/zrz[m[33m)[m HEAD@{37}: commit (merge): Merge branch 'main' of https://gitee.com/CakeCN/code-agent
|
||||
[33m5f8f6c94[m HEAD@{38}: commit: many ok
|
||||
[33me24aa12e[m HEAD@{39}: commit: ready to process
|
||||
[33m6766ca85[m HEAD@{40}: commit (merge): Merge branch 'feature/voice_send'
|
||||
[33m3c9c7553[m HEAD@{41}: checkout: moving from feature/voice_send to main
|
||||
[33m58a95e9f[m[33m ([m[1;31morigin/feature/voice_send[m[33m, [m[1;32mfeature/voice_send[m[33m)[m HEAD@{42}: commit: ready merge to main
|
||||
[33m79125ffc[m HEAD@{43}: commit: change .cn to .com
|
||||
[33m2f9bc7df[m HEAD@{44}: checkout: moving from main to feature/voice_send
|
||||
[33m3c9c7553[m HEAD@{45}: reset: moving to HEAD
|
||||
[33m3c9c7553[m HEAD@{46}: checkout: moving from feature/voice_send to main
|
||||
[33m2f9bc7df[m HEAD@{47}: pull: Fast-forward
|
||||
[33m504c5cae[m[33m ([m[1;32m0v[m[33m)[m HEAD@{48}: checkout: moving from main to feature/voice_send
|
||||
[33m3c9c7553[m HEAD@{49}: commit: cn/com allow all
|
||||
[33m7122c3be[m HEAD@{50}: commit (merge): fix url
|
||||
[33me07c41fb[m HEAD@{51}: commit: fix code-server reboot problem(close debug)
|
||||
[33m821e20c9[m HEAD@{52}: commit: clear double iframe more safe
|
||||
[33m053584a7[m HEAD@{53}: checkout: moving from feature/voice_send to main
|
||||
[33m504c5cae[m[33m ([m[1;32m0v[m[33m)[m HEAD@{54}: checkout: moving from main to feature/voice_send
|
||||
[33m053584a7[m HEAD@{55}: commit: clear iframe double
|
||||
[33m10481b0b[m HEAD@{56}: commit: fix permisson bug
|
||||
[33mdc0eeaa9[m HEAD@{57}: commit: add hint
|
||||
[33ma24df620[m HEAD@{58}: commit: fix some bug
|
||||
[33m3ad36c29[m HEAD@{59}: commit: 25/09/24 10:00~11:30 停机维护
|
||||
[33m07cf2363[m HEAD@{60}: commit: fix many bug
|
||||
[33m6aac4200[m HEAD@{61}: commit: try hello message
|
||||
[33m271672c9[m HEAD@{62}: commit: check to code-server-like
|
||||
[33m252c426c[m HEAD@{63}: pull: Merge made by the 'ort' strategy.
|
||||
[33m588fc3b6[m HEAD@{64}: commit: ready to code-like
|
||||
[33mb1f832a2[m[33m ([m[1;31morigin/code-like-autosave[m[33m, [m[1;32mcode-like-autosave[m[33m)[m HEAD@{65}: merge code-like-autosave: Fast-forward
|
||||
[33m24f191d5[m HEAD@{66}: checkout: moving from code-like-autosave to main
|
||||
[33mb1f832a2[m[33m ([m[1;31morigin/code-like-autosave[m[33m, [m[1;32mcode-like-autosave[m[33m)[m HEAD@{67}: checkout: moving from main to code-like-autosave
|
||||
[33m24f191d5[m HEAD@{68}: clone: from https://gitee.com/CakeCN/code-agent.git
|
||||
Reference in New Issue
Block a user