feat: 加入动作录制和回放机制
这个提交包含在:
71
examples/test_connection_fixes.sh
可执行文件
71
examples/test_connection_fixes.sh
可执行文件
@ -0,0 +1,71 @@
|
||||
#!/bin/bash
|
||||
|
||||
echo "=== 连接状态管理修复测试 ==="
|
||||
echo ""
|
||||
|
||||
# 停止可能正在运行的服务
|
||||
echo "1. 停止现有服务..."
|
||||
pkill -f "python main.py" 2>/dev/null
|
||||
pkill -f "vite" 2>/dev/null
|
||||
sleep 2
|
||||
|
||||
# 启动后端服务
|
||||
echo "2. 启动后端服务..."
|
||||
cd mock-server
|
||||
python main.py &
|
||||
BACKEND_PID=$!
|
||||
sleep 3
|
||||
|
||||
echo "后端服务已启动 (PID: $BACKEND_PID)"
|
||||
echo "监听端口: 8000"
|
||||
echo ""
|
||||
|
||||
# 启动前端服务
|
||||
echo "3. 启动前端服务..."
|
||||
cd ../frontend
|
||||
npm run dev &
|
||||
FRONTEND_PID=$!
|
||||
sleep 5
|
||||
|
||||
echo "前端服务已启动 (PID: $FRONTEND_PID)"
|
||||
echo "监听端口: 5173"
|
||||
echo ""
|
||||
|
||||
echo "=== 测试步骤 ==="
|
||||
echo ""
|
||||
echo "1. 打开浏览器访问: http://localhost:5173"
|
||||
echo "2. 打开浏览器开发者工具控制台"
|
||||
echo ""
|
||||
echo "3. 测试自动重连问题修复:"
|
||||
echo " - 连接WebSocket: ws://localhost:8000/ws/six_axis"
|
||||
echo " - 等待连接成功"
|
||||
echo " - 点击'断开'按钮"
|
||||
echo " - 检查控制台: 应该看到'用户主动断开连接,不进行重连'"
|
||||
echo " - 验证: 连接不应该自动重新建立"
|
||||
echo ""
|
||||
echo "4. 测试连接会话切换问题修复:"
|
||||
echo " - 连接6轴机械臂: ws://localhost:8000/ws/six_axis"
|
||||
echo " - 点击'断开'按钮"
|
||||
echo " - 连接SCARA机器人: 切换选择框到'SCARA机器人',点击'连接'"
|
||||
echo " - 检查控制台: 应该看到连接ID变化,旧连接事件被忽略"
|
||||
echo " - 验证: 应该只有SCARA机器人的连接活跃,不会出现交替连接"
|
||||
echo ""
|
||||
echo "5. 测试快速切换连接:"
|
||||
echo " - 快速在两种机械臂类型间切换连接"
|
||||
echo " - 检查控制台: 应该看到连接ID正确管理,旧连接被清理"
|
||||
echo " - 验证: 连接状态应该稳定,不会出现多个连接竞争"
|
||||
echo ""
|
||||
echo "6. 测试意外断开重连:"
|
||||
echo " - 保持连接状态"
|
||||
echo " - 手动停止后端服务: kill $BACKEND_PID"
|
||||
echo " - 检查控制台: 应该看到重连尝试(指数退避)"
|
||||
echo " - 重新启动后端: cd mock-server && python main.py &"
|
||||
echo " - 验证: 应该自动重连成功"
|
||||
echo ""
|
||||
|
||||
echo "按 Ctrl+C 停止测试"
|
||||
echo ""
|
||||
|
||||
# 等待用户中断
|
||||
trap "echo ''; echo '停止服务...'; kill $BACKEND_PID $FRONTEND_PID 2>/dev/null; echo '测试完成'; exit" INT
|
||||
wait
|
||||
41
examples/test_fix.sh
可执行文件
41
examples/test_fix.sh
可执行文件
@ -0,0 +1,41 @@
|
||||
#!/bin/bash
|
||||
|
||||
echo "=== 机械臂控制助手修复测试 ==="
|
||||
echo ""
|
||||
|
||||
# 启动后端服务
|
||||
echo "1. 启动后端服务..."
|
||||
cd mock-server
|
||||
python main.py &
|
||||
BACKEND_PID=$!
|
||||
sleep 3
|
||||
|
||||
echo "后端服务已启动 (PID: $BACKEND_PID)"
|
||||
echo ""
|
||||
|
||||
# 启动前端服务
|
||||
echo "2. 启动前端服务..."
|
||||
cd ../frontend
|
||||
npm run dev &
|
||||
FRONTEND_PID=$!
|
||||
sleep 5
|
||||
|
||||
echo "前端服务已启动 (PID: $FRONTEND_PID)"
|
||||
echo ""
|
||||
|
||||
echo "=== 测试说明 ==="
|
||||
echo "1. 打开浏览器访问: http://localhost:5173"
|
||||
echo "2. 连接WebSocket: ws://localhost:8000/ws/six_axis"
|
||||
echo "3. 测试以下功能:"
|
||||
echo " - 连接/断开连接"
|
||||
echo " - 拖动关节滑块,观察3D模型变化"
|
||||
echo " - 检查控制台是否有WebSocket消息发送"
|
||||
echo " - 断开后重新连接,检查3D模型是否清理"
|
||||
echo ""
|
||||
|
||||
echo "按 Ctrl+C 停止测试"
|
||||
echo ""
|
||||
|
||||
# 等待用户中断
|
||||
trap "echo ''; echo '停止服务...'; kill $BACKEND_PID $FRONTEND_PID 2>/dev/null; echo '测试完成'; exit" INT
|
||||
wait
|
||||
65
examples/test_fixes.sh
可执行文件
65
examples/test_fixes.sh
可执行文件
@ -0,0 +1,65 @@
|
||||
#!/bin/bash
|
||||
|
||||
echo "=== 机械臂控制助手修复测试 ==="
|
||||
echo ""
|
||||
|
||||
# 停止可能正在运行的服务
|
||||
echo "1. 停止现有服务..."
|
||||
pkill -f "python main.py" 2>/dev/null
|
||||
pkill -f "vite" 2>/dev/null
|
||||
sleep 2
|
||||
|
||||
# 启动后端服务
|
||||
echo "2. 启动后端服务..."
|
||||
cd mock-server
|
||||
python main.py &
|
||||
BACKEND_PID=$!
|
||||
sleep 3
|
||||
|
||||
echo "后端服务已启动 (PID: $BACKEND_PID)"
|
||||
echo "监听端口: 8000"
|
||||
echo ""
|
||||
|
||||
# 启动前端服务
|
||||
echo "3. 启动前端服务..."
|
||||
cd ../frontend
|
||||
npm run dev &
|
||||
FRONTEND_PID=$!
|
||||
sleep 5
|
||||
|
||||
echo "前端服务已启动 (PID: $FRONTEND_PID)"
|
||||
echo "监听端口: 5173"
|
||||
echo ""
|
||||
|
||||
echo "=== 测试步骤 ==="
|
||||
echo ""
|
||||
echo "1. 打开浏览器访问: http://localhost:5173"
|
||||
echo "2. 连接WebSocket: ws://localhost:8000/ws/six_axis"
|
||||
echo "3. 测试以下功能:"
|
||||
echo ""
|
||||
echo " A. 两个模型问题测试:"
|
||||
echo " - 连接后应该只显示一个3D机械臂模型"
|
||||
echo " - 断开连接后重新连接,应该只显示一个新模型"
|
||||
echo ""
|
||||
echo " B. 角度重置问题测试:"
|
||||
echo " - 拖动一个关节的滑块,观察角度变化"
|
||||
echo " - 然后拖动另一个关节的滑块"
|
||||
echo " - 检查第一个关节的角度是否保持稳定,不会重置"
|
||||
echo ""
|
||||
echo " C. 连接稳定性测试:"
|
||||
echo " - 连续操作多个关节"
|
||||
echo " - 观察控制台是否有频繁断开连接的消息"
|
||||
echo " - 检查心跳机制是否正常工作"
|
||||
echo ""
|
||||
echo "4. 打开浏览器开发者工具,查看控制台输出:"
|
||||
echo " - 应该看到连接成功的消息"
|
||||
echo " - 应该看到关节角度发送和确认的消息"
|
||||
echo " - 应该看到心跳消息(每30秒)"
|
||||
echo ""
|
||||
|
||||
echo "按 Ctrl+C 停止测试"
|
||||
echo ""
|
||||
|
||||
# 等待用户中断
|
||||
trap "echo ''; echo '停止服务...'; kill $BACKEND_PID $FRONTEND_PID 2>/dev/null; echo '测试完成'; exit" INT
|
||||
wait
|
||||
121
examples/verify_connection_fixes.py
普通文件
121
examples/verify_connection_fixes.py
普通文件
@ -0,0 +1,121 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
验证连接状态管理的关键修复
|
||||
"""
|
||||
|
||||
import os
|
||||
import re
|
||||
|
||||
|
||||
def check_file(filepath, patterns):
|
||||
"""检查文件中是否包含特定模式"""
|
||||
if not os.path.exists(filepath):
|
||||
print(f"❌ 文件不存在: {filepath}")
|
||||
return False
|
||||
|
||||
with open(filepath, "r", encoding="utf-8") as f:
|
||||
content = f.read()
|
||||
|
||||
all_found = True
|
||||
for pattern_name, pattern in patterns.items():
|
||||
if re.search(pattern, content, re.MULTILINE | re.DOTALL):
|
||||
print(f" ✓ {pattern_name}")
|
||||
else:
|
||||
print(f" ✗ {pattern_name}")
|
||||
all_found = False
|
||||
|
||||
return all_found
|
||||
|
||||
|
||||
def main():
|
||||
print("=== 验证连接状态管理修复 ===")
|
||||
print()
|
||||
|
||||
# 检查关键修复
|
||||
checks = {
|
||||
"1. 用户主动断开标识": {
|
||||
"file": "frontend/src/composables/useWebSocket.ts",
|
||||
"patterns": {
|
||||
"isManualDisconnect标志": r"let isManualDisconnect = false",
|
||||
"disconnect中设置标志": r"isManualDisconnect = true",
|
||||
"onclose中检查标志": r"if \(isManualDisconnect\)",
|
||||
"重置标志": r"isManualDisconnect = false",
|
||||
},
|
||||
},
|
||||
"2. 连接ID管理": {
|
||||
"file": "frontend/src/composables/useWebSocket.ts",
|
||||
"patterns": {
|
||||
"currentConnectionId": r"let currentConnectionId: string \| null = null",
|
||||
"生成连接ID": r"const connectionId = Date\.now\(\)\.toString\(\)",
|
||||
"连接ID检查": r"if \(currentConnectionId !== connectionId\)",
|
||||
"清理旧连接": r"cleanupPreviousConnection",
|
||||
},
|
||||
},
|
||||
"3. 统一状态管理": {
|
||||
"file": "frontend/src/composables/useWebSocket.ts",
|
||||
"patterns": {
|
||||
"updateConnectionStatus函数": r"const updateConnectionStatus = \(status:",
|
||||
"状态同步": r"isConnected\.value = status === 'connected'",
|
||||
"robotStore状态更新": r"robotStore\.setConnectionStatus\(status\)",
|
||||
},
|
||||
},
|
||||
"4. 连接清理逻辑": {
|
||||
"file": "frontend/src/composables/useWebSocket.ts",
|
||||
"patterns": {
|
||||
"resetConnection函数": r"const resetConnection = \(\) =>",
|
||||
"重置所有状态": r"currentConnectionId = null",
|
||||
"停止定时器": r"stopHeartbeat\(\)",
|
||||
"清除重连定时器": r"if \(reconnectTimeout\)",
|
||||
},
|
||||
},
|
||||
"5. ConnectionBar优化": {
|
||||
"file": "frontend/src/components/ConnectionBar.vue",
|
||||
"patterns": {
|
||||
"使用resetConnection": r"resetConnection\(\)",
|
||||
"完全断开逻辑": r"console\.log\('连接已完全断开并重置'\)",
|
||||
"连接中指示器": r"connecting-indicator",
|
||||
},
|
||||
},
|
||||
"6. Store状态管理": {
|
||||
"file": "frontend/src/stores/robot.ts",
|
||||
"patterns": {
|
||||
"forceConnectionStatus": r"forceConnectionStatus\(status:",
|
||||
"状态清理": r"clearRobot\(\)",
|
||||
"连接状态重置": r"this\.connectionStatus = 'disconnected'",
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
all_passed = True
|
||||
for check_name, check_info in checks.items():
|
||||
print(f"{check_name}:")
|
||||
filepath = check_info["file"]
|
||||
patterns = check_info["patterns"]
|
||||
|
||||
if check_file(filepath, patterns):
|
||||
print(f" ✅ 通过")
|
||||
else:
|
||||
print(f" ❌ 失败")
|
||||
all_passed = False
|
||||
print()
|
||||
|
||||
if all_passed:
|
||||
print("✅ 所有关键修复都已实施")
|
||||
print()
|
||||
print("测试建议:")
|
||||
print("1. 运行 ./test_connection_fixes.sh 启动服务")
|
||||
print("2. 访问 http://localhost:5173")
|
||||
print("3. 按照测试步骤验证修复效果")
|
||||
print()
|
||||
print("预期行为:")
|
||||
print("- 用户断开连接后不会自动重连")
|
||||
print("- 切换机械臂时不会出现连接交替")
|
||||
print("- 连接状态同步一致")
|
||||
print("- 快速操作时连接稳定")
|
||||
else:
|
||||
print("❌ 部分修复未完全实施")
|
||||
print("请检查上述失败的项目")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
106
examples/verify_fixes.py
普通文件
106
examples/verify_fixes.py
普通文件
@ -0,0 +1,106 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
验证机械臂控制助手的关键修复
|
||||
"""
|
||||
|
||||
import os
|
||||
import re
|
||||
|
||||
|
||||
def check_file(filepath, patterns):
|
||||
"""检查文件中是否包含特定模式"""
|
||||
if not os.path.exists(filepath):
|
||||
print(f"❌ 文件不存在: {filepath}")
|
||||
return False
|
||||
|
||||
with open(filepath, "r", encoding="utf-8") as f:
|
||||
content = f.read()
|
||||
|
||||
all_found = True
|
||||
for pattern_name, pattern in patterns.items():
|
||||
if re.search(pattern, content, re.MULTILINE | re.DOTALL):
|
||||
print(f" ✓ {pattern_name}")
|
||||
else:
|
||||
print(f" ✗ {pattern_name}")
|
||||
all_found = False
|
||||
|
||||
return all_found
|
||||
|
||||
|
||||
def main():
|
||||
print("=== 验证机械臂控制助手修复 ===")
|
||||
print()
|
||||
|
||||
# 检查关键修复
|
||||
checks = {
|
||||
"1. ThreeViewer场景清理修复": {
|
||||
"file": "frontend/src/components/ThreeViewer.vue",
|
||||
"patterns": {
|
||||
"递归清理函数": r"const cleanupObject = \(obj: THREE\.Object3D\) => {",
|
||||
"几何体清理": r"obj\.geometry\.dispose\(\)",
|
||||
"材质清理": r"obj\.material\.dispose\(\)",
|
||||
"构建状态锁": r"let isBuilding = false",
|
||||
},
|
||||
},
|
||||
"2. Store状态锁修复": {
|
||||
"file": "frontend/src/stores/robot.ts",
|
||||
"patterns": {
|
||||
"状态锁集合": r"const sendingCommands = new Set<string>\(\)",
|
||||
"发送命令检查": r"sendingCommands\.has\(jointId\)",
|
||||
"添加状态锁": r"sendingCommands\.add\(jointId\)",
|
||||
"移除状态锁": r"sendingCommands\.delete\([^)]+\)",
|
||||
},
|
||||
},
|
||||
"3. WebSocket心跳机制": {
|
||||
"file": "frontend/src/composables/useWebSocket.ts",
|
||||
"patterns": {
|
||||
"心跳间隔": r"const HEARTBEAT_INTERVAL = 30000",
|
||||
"启动心跳": r"const startHeartbeat = \(\) => {",
|
||||
"停止心跳": r"const stopHeartbeat = \(\) => {",
|
||||
"处理pong": r"const handlePong = \(timestamp: number\) => {",
|
||||
},
|
||||
},
|
||||
"4. 后端ping/pong支持": {
|
||||
"file": "mock-server/main.py",
|
||||
"patterns": {
|
||||
"ping消息处理": r'"type" in data and data\["type"\] == "ping"',
|
||||
"pong响应": r'"type": "pong"',
|
||||
},
|
||||
},
|
||||
"5. 防抖优化": {
|
||||
"file": "frontend/src/utils/debounce.ts",
|
||||
"patterns": {
|
||||
"带立即执行的防抖": r"debounceWithImmediate",
|
||||
"尾随防抖": r"debounceTrailing",
|
||||
"保存最后参数": r"let lastArgs: Parameters<T> \| null = null",
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
all_passed = True
|
||||
for check_name, check_info in checks.items():
|
||||
print(f"{check_name}:")
|
||||
filepath = check_info["file"]
|
||||
patterns = check_info["patterns"]
|
||||
|
||||
if check_file(filepath, patterns):
|
||||
print(f" ✅ 通过")
|
||||
else:
|
||||
print(f" ❌ 失败")
|
||||
all_passed = False
|
||||
print()
|
||||
|
||||
if all_passed:
|
||||
print("✅ 所有关键修复都已实施")
|
||||
print()
|
||||
print("测试建议:")
|
||||
print("1. 运行 ./test_fixes.sh 启动服务")
|
||||
print("2. 访问 http://localhost:5173")
|
||||
print("3. 测试两个模型、角度重置和连接稳定性问题")
|
||||
else:
|
||||
print("❌ 部分修复未完全实施")
|
||||
print("请检查上述失败的项目")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
在新工单中引用
屏蔽一个用户