V0.29.0.250619_alpha:增加网络监控页面
This commit is contained in:
parent
9c3326eeda
commit
19147adc1b
Binary file not shown.
Binary file not shown.
@ -13,6 +13,7 @@ class NetworkMonitor extends HTMLElement {
|
||||
data: [],
|
||||
timer: null,
|
||||
statusMsg: '',
|
||||
selectedData: null,
|
||||
};
|
||||
}
|
||||
|
||||
@ -37,7 +38,25 @@ class NetworkMonitor extends HTMLElement {
|
||||
border-radius: 12px;
|
||||
box-shadow: 0 2px 12px rgba(0,0,0,0.07);
|
||||
padding: 24px 20px 20px 20px;
|
||||
max-width: 600px;
|
||||
width: 100%;
|
||||
min-width: 400px;
|
||||
max-width: 100%;
|
||||
height: 100%;
|
||||
overflow-y: auto;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.container {
|
||||
display: flex;
|
||||
height: 100%;
|
||||
gap: 20px;
|
||||
}
|
||||
.left-panel {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
.right-panel {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
.form-row {
|
||||
display: flex;
|
||||
@ -118,13 +137,16 @@ class NetworkMonitor extends HTMLElement {
|
||||
color: #e53935;
|
||||
}
|
||||
.data-list {
|
||||
max-height: 340px;
|
||||
height: calc(100% - 143px);
|
||||
min-height: 200px;
|
||||
overflow-y: auto;
|
||||
background: #fff;
|
||||
border-radius: 10px;
|
||||
border: 1px solid #e0e3e7;
|
||||
padding: 10px 0 10px 0;
|
||||
box-shadow: 0 1px 6px rgba(0,0,0,0.04);
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.data-item {
|
||||
background: #f8fafc;
|
||||
@ -135,36 +157,146 @@ class NetworkMonitor extends HTMLElement {
|
||||
border-left: 4px solid #409eff;
|
||||
font-size: 14px;
|
||||
transition: box-shadow 0.2s;
|
||||
cursor: pointer;
|
||||
}
|
||||
.data-item:hover {
|
||||
box-shadow: 0 2px 8px rgba(64,158,255,0.13);
|
||||
}
|
||||
.data-item.selected {
|
||||
background: #e3f2fd;
|
||||
border-left-color: #1976d2;
|
||||
box-shadow: 0 2px 8px rgba(25,118,210,0.2);
|
||||
}
|
||||
.data-item b {
|
||||
color: #1976d2;
|
||||
}
|
||||
.data-item pre {
|
||||
background: #f3f7fa;
|
||||
border-radius: 4px;
|
||||
padding: 4px 6px;
|
||||
margin: 2px 0 0 0;
|
||||
.detail-panel {
|
||||
background: #fff;
|
||||
border-radius: 10px;
|
||||
border: 1px solid #e0e3e7;
|
||||
padding: 20px;
|
||||
box-shadow: 0 1px 6px rgba(0,0,0,0.04);
|
||||
height: calc(100% - 40px);
|
||||
overflow-y: auto;
|
||||
}
|
||||
.detail-header {
|
||||
margin-bottom: 6px;
|
||||
padding-bottom: 4px;
|
||||
border-bottom: 2px solid #e3f2fd;
|
||||
}
|
||||
.detail-header h2 {
|
||||
margin: 0 0 10px 0;
|
||||
color: #1976d2;
|
||||
font-size: 20px;
|
||||
font-weight: 600;
|
||||
}
|
||||
.hex-content {
|
||||
background: #f8fafc;
|
||||
border-radius: 8px;
|
||||
padding: 16px;
|
||||
font-family: 'Courier New', monospace;
|
||||
font-size: 13px;
|
||||
color: #333;
|
||||
line-height: 1.4;
|
||||
white-space: pre-wrap;
|
||||
word-break: break-all;
|
||||
border: 1px solid #e0e3e7;
|
||||
height: 250px;
|
||||
max-height: 250px;
|
||||
overflow-y: auto;
|
||||
overflow-x: hidden;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.parse-content {
|
||||
background: #f8fafc;
|
||||
border-radius: 8px;
|
||||
padding: 16px;
|
||||
font-family: 'Segoe UI', sans-serif;
|
||||
font-size: 14px;
|
||||
line-height: 1.6;
|
||||
border: 1px solid #e0e3e7;
|
||||
margin-top: 16px;
|
||||
max-height: 400px;
|
||||
overflow-y: auto;
|
||||
}
|
||||
.parse-item {
|
||||
margin-bottom: 12px;
|
||||
padding: 8px 12px;
|
||||
background: #fff;
|
||||
border-radius: 6px;
|
||||
border-left: 4px solid #409eff;
|
||||
box-shadow: 0 1px 3px rgba(0,0,0,0.05);
|
||||
}
|
||||
.parse-item b {
|
||||
color: #1976d2;
|
||||
margin-right: 8px;
|
||||
font-size: 16px;
|
||||
}
|
||||
.parse-item .hex-value {
|
||||
background: #e3f2fd;
|
||||
padding: 2px 6px;
|
||||
border-radius: 4px;
|
||||
font-family: 'Courier New', monospace;
|
||||
font-size: 12px;
|
||||
color: #1976d2;
|
||||
margin: 0 4px;
|
||||
}
|
||||
.hex-content .offset {
|
||||
color: #666;
|
||||
font-weight: bold;
|
||||
}
|
||||
.hex-content .hex {
|
||||
color: #1976d2;
|
||||
}
|
||||
.no-selection {
|
||||
text-align: center;
|
||||
padding: 60px 20px;
|
||||
color: #999;
|
||||
font-style: italic;
|
||||
font-size: 16px;
|
||||
}
|
||||
.no-selection::before {
|
||||
content: '📋';
|
||||
display: block;
|
||||
font-size: 48px;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
.nodata {
|
||||
color: #bbb;
|
||||
text-align: center;
|
||||
padding: 30px 0;
|
||||
}
|
||||
.detail-title {
|
||||
font-size: 16px;
|
||||
font-weight: 600;
|
||||
color: #2c3e50;
|
||||
margin-bottom: 4px;
|
||||
padding: 8px 0;
|
||||
border-bottom: 2px solid #409eff;
|
||||
}
|
||||
</style>
|
||||
<div class="status">${this.state.statusMsg}</div>
|
||||
<div class="form-row">
|
||||
<label>IP: <input type="text" id="ip" value="${this.state.ip}" /></label>
|
||||
<label>端口: <input type="number" id="port" value="${this.state.port}" min="1024" max="65535" /></label>
|
||||
<button id="startBtn">开始抓包</button>
|
||||
<button id="stopBtn">停止抓包</button>
|
||||
<div class="container">
|
||||
<div class="left-panel">
|
||||
<div class="status">${this.state.statusMsg}</div>
|
||||
<div class="form-row">
|
||||
<label>IP: <input type="text" id="ip" value="${this.state.ip}" /></label>
|
||||
<label>端口: <input type="number" id="port" value="${this.state.port}" min="1024" max="65535" /></label>
|
||||
<button id="startBtn">开始抓包</button>
|
||||
<button id="stopBtn">停止抓包</button>
|
||||
</div>
|
||||
<div class="monitor-status">抓包状态:<span id="monitorStatus" class="${this.state.isMonitoring ? '' : 'stopped'}">${this.state.isMonitoring ? '运行中' : '已停止'}</span></div>
|
||||
<div class="data-list" id="dataList"></div>
|
||||
</div>
|
||||
<div class="right-panel">
|
||||
<div class="detail-panel">
|
||||
<div class="detail-header">
|
||||
<h2>UDP数据包详情</h2>
|
||||
</div>
|
||||
<div id="detailContent">
|
||||
<div class="no-selection">请从左侧选择一个数据包查看详情</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="monitor-status">抓包状态:<span id="monitorStatus" class="${this.state.isMonitoring ? '' : 'stopped'}">${this.state.isMonitoring ? '运行中' : '已停止'}</span></div>
|
||||
<div class="data-list" id="dataList"></div>
|
||||
`;
|
||||
this.shadowRoot.getElementById('startBtn').onclick = () => this.startMonitor();
|
||||
this.shadowRoot.getElementById('stopBtn').onclick = () => this.stopMonitor();
|
||||
@ -184,13 +316,67 @@ class NetworkMonitor extends HTMLElement {
|
||||
dataList.innerHTML = '<div class="nodata">暂无数据</div>';
|
||||
return;
|
||||
}
|
||||
dataList.innerHTML = this.state.data.map(item => `
|
||||
<div class="data-item">
|
||||
<div><b>时间:</b> ${new Date(item.timestamp).toLocaleString()}</div>
|
||||
<div><b>来源:</b> ${item.source}</div>
|
||||
<div><b>内容:</b> <pre>${typeof item.data === 'object' ? JSON.stringify(item.data, null, 2) : item.data}</pre></div>
|
||||
dataList.innerHTML = this.state.data.map((item, index) => `
|
||||
<div class="data-item ${this.state.selectedData === index ? 'selected' : ''}" data-index="${index}">
|
||||
<table style="width: 100%; border-collapse: collapse;">
|
||||
<tr>
|
||||
<td style="width: 40%; padding: 2px 0;"><b>时间:</b> ${new Date(item.timestamp).toLocaleString('zh-CN', {
|
||||
year: 'numeric',
|
||||
month: '2-digit',
|
||||
day: '2-digit',
|
||||
hour: '2-digit',
|
||||
minute: '2-digit',
|
||||
second: '2-digit',
|
||||
fractionalSecondDigits: 3
|
||||
})}</td>
|
||||
<td style="width: 35%; padding: 2px 0;"><b>来源:</b> ${item.source}</td>
|
||||
<td style="width: 25%; padding: 2px 0;"><b>大小:</b> ${item.length || this.getDataSize(item.data)} 字节</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
`).join('');
|
||||
|
||||
// 添加点击事件
|
||||
dataList.querySelectorAll('.data-item').forEach(item => {
|
||||
item.addEventListener('click', (e) => {
|
||||
const index = parseInt(e.currentTarget.dataset.index);
|
||||
this.selectDataItem(index);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
getDataSize(data) {
|
||||
// 如果数据是十六进制字符串,每两个字符代表一个字节
|
||||
if (typeof data === 'string' && /^[0-9a-fA-F]+$/.test(data)) {
|
||||
return Math.ceil(data.length / 2);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
formatDataAsHex(data) {
|
||||
// 如果数据是十六进制字符串,直接处理
|
||||
if (typeof data === 'string' && /^[0-9a-fA-F]+$/.test(data)) {
|
||||
const bytes = [];
|
||||
for (let i = 0; i < data.length; i += 2) {
|
||||
const byte = parseInt(data.substr(i, 2), 16);
|
||||
bytes.push(byte);
|
||||
}
|
||||
|
||||
// 分行显示,每行16个字节
|
||||
const bytesPerLine = 16;
|
||||
const lines = [];
|
||||
|
||||
for (let i = 0; i < bytes.length; i += bytesPerLine) {
|
||||
const lineBytes = bytes.slice(i, i + bytesPerLine);
|
||||
const lineHex = lineBytes.map(byte => byte.toString(16).padStart(2, '0')).join(' ');
|
||||
const offset = i.toString(16).padStart(4, '0').toUpperCase();
|
||||
lines.push(`${offset}: ${lineHex}`);
|
||||
}
|
||||
|
||||
return lines.join('\n');
|
||||
}
|
||||
|
||||
return '无效数据格式';
|
||||
}
|
||||
|
||||
setStatus(msg) {
|
||||
@ -257,6 +443,7 @@ class NetworkMonitor extends HTMLElement {
|
||||
this.state.data = this.state.data.slice(-1000);
|
||||
}
|
||||
this.renderDataList();
|
||||
this.updateDetailContent();
|
||||
}
|
||||
this.state.isMonitoring = data.isMonitoring;
|
||||
this.shadowRoot.getElementById('monitorStatus').textContent = data.isMonitoring ? '运行中' : '已停止';
|
||||
@ -284,6 +471,141 @@ class NetworkMonitor extends HTMLElement {
|
||||
reactivate() {
|
||||
this.initialize();
|
||||
}
|
||||
|
||||
selectDataItem(index) {
|
||||
this.state.selectedData = index;
|
||||
this.renderDataList();
|
||||
this.updateDetailContent();
|
||||
}
|
||||
|
||||
updateDetailContent() {
|
||||
const detailContent = this.shadowRoot.getElementById('detailContent');
|
||||
if (!detailContent) return;
|
||||
|
||||
if (this.state.selectedData === null || !this.state.data[this.state.selectedData]) {
|
||||
detailContent.innerHTML = '<div class="no-selection">请从左侧选择一个数据包查看详情</div>';
|
||||
return;
|
||||
}
|
||||
|
||||
const item = this.state.data[this.state.selectedData];
|
||||
detailContent.innerHTML = `
|
||||
<div class="hex-content">${this.formatHexContent(item.data)}</div>
|
||||
<div class="parse-content">
|
||||
${this.formatParseContent(item.data)}
|
||||
</div>
|
||||
`;
|
||||
}
|
||||
|
||||
getPacketIndex(packet) {
|
||||
// 这里可以根据需要实现数据包序号逻辑
|
||||
return Math.floor(Math.random() * 1000) + 1;
|
||||
}
|
||||
|
||||
formatHexContent(data) {
|
||||
// 如果数据是十六进制字符串,直接处理
|
||||
if (typeof data === 'string' && /^[0-9a-fA-F]+$/.test(data)) {
|
||||
const bytes = [];
|
||||
for (let i = 0; i < data.length; i += 2) {
|
||||
const byte = parseInt(data.substr(i, 2), 16);
|
||||
bytes.push(byte);
|
||||
}
|
||||
|
||||
// 分行显示,每行16个字节
|
||||
const bytesPerLine = 16;
|
||||
const lines = [];
|
||||
|
||||
for (let i = 0; i < bytes.length; i += bytesPerLine) {
|
||||
const lineBytes = bytes.slice(i, i + bytesPerLine);
|
||||
const lineHex = lineBytes.map(byte => byte.toString(16).padStart(2, '0')).join(' ');
|
||||
const offset = i.toString(16).padStart(4, '0').toUpperCase();
|
||||
lines.push(`${offset}: ${lineHex}`);
|
||||
}
|
||||
|
||||
return lines.join('\n');
|
||||
}
|
||||
|
||||
return '无效数据格式';
|
||||
}
|
||||
|
||||
formatParseContent(data) {
|
||||
if (typeof data !== 'string' || !/^[0-9a-fA-F]+$/.test(data) || data.length < 14) {
|
||||
return '<div class="parse-item">数据包长度不足,无法解析</div>';
|
||||
}
|
||||
|
||||
const bytes = [];
|
||||
for (let i = 0; i < data.length; i += 2) {
|
||||
const byte = parseInt(data.substr(i, 2), 16);
|
||||
bytes.push(byte);
|
||||
}
|
||||
|
||||
// 解析数据包头
|
||||
const header = bytes.slice(0, 6); // 前6个字节
|
||||
const sizeBytes = bytes.slice(6, 8); // 第7-8个字节表示数据包大小
|
||||
|
||||
let parseResult = '<div style="margin-bottom: 12px;"><b style="color: #1976d2; font-size: 16px;">数据包头解析</b></div>';
|
||||
|
||||
// 1. a6-XNSim数据
|
||||
parseResult += `<div class="parse-item"><b>1.</b> <span class="hex-value">${header[0].toString(16).padStart(2, '0')}</span> - XNSim数据</div>`;
|
||||
|
||||
// 2. c0-C909数据 c1-C919数据
|
||||
const dataType = header[1];
|
||||
let dataTypeDesc = '';
|
||||
if (dataType === 0xc0) {
|
||||
dataTypeDesc = 'C909数据';
|
||||
} else if (dataType === 0xc1) {
|
||||
dataTypeDesc = 'C919数据';
|
||||
} else {
|
||||
dataTypeDesc = `未知数据类型(${dataType.toString(16).padStart(2, '0')})`;
|
||||
}
|
||||
parseResult += `<div class="parse-item"><b>2.</b> <span class="hex-value">${dataType.toString(16).padStart(2, '0')}</span> - ${dataTypeDesc}</div>`;
|
||||
|
||||
// 3. ATA章节号
|
||||
const ataChapter = header[2];
|
||||
parseResult += `<div class="parse-item"><b>3.</b> <span class="hex-value">${ataChapter.toString(16).padStart(2, '0')}</span> - ATA章节号 (ATA${ataChapter.toString().padStart(2, '0')})</div>`;
|
||||
|
||||
// 4. 模型编号
|
||||
const modelNumber = header[3];
|
||||
parseResult += `<div class="parse-item"><b>4.</b> <span class="hex-value">${modelNumber.toString(16).padStart(2, '0')}</span> - 模型编号 (${modelNumber})</div>`;
|
||||
|
||||
// 5. 结构体类别
|
||||
const structType = header[4];
|
||||
let structTypeDesc = '';
|
||||
switch (structType) {
|
||||
case 0x00:
|
||||
structTypeDesc = '输入结构体';
|
||||
break;
|
||||
case 0x01:
|
||||
structTypeDesc = '输出结构体';
|
||||
break;
|
||||
case 0x02:
|
||||
structTypeDesc = '心跳结构体';
|
||||
break;
|
||||
default:
|
||||
structTypeDesc = `未知结构体类型(${structType.toString(16).padStart(2, '0')})`;
|
||||
}
|
||||
parseResult += `<div class="parse-item"><b>5.</b> <span class="hex-value">${structType.toString(16).padStart(2, '0')}</span> - 结构体类别 (${structTypeDesc})</div>`;
|
||||
|
||||
// 6. 数据传输方向
|
||||
const direction = header[5];
|
||||
let directionDesc = '';
|
||||
switch (direction) {
|
||||
case 0x00:
|
||||
directionDesc = '输入';
|
||||
break;
|
||||
case 0x01:
|
||||
directionDesc = '输出';
|
||||
break;
|
||||
default:
|
||||
directionDesc = `未知方向(${direction.toString(16).padStart(2, '0')})`;
|
||||
}
|
||||
parseResult += `<div class="parse-item"><b>6.</b> <span class="hex-value">${direction.toString(16).padStart(2, '0')}</span> - 数据传输方向 (${directionDesc})</div>`;
|
||||
|
||||
// 7. 数据包大小
|
||||
const packetSize = (sizeBytes[0] << 8) | sizeBytes[1];
|
||||
parseResult += `<div class="parse-item"><b>7.</b> <span class="hex-value">${sizeBytes[0].toString(16).padStart(2, '0')} ${sizeBytes[1].toString(16).padStart(2, '0')}</span> - 数据包大小 (${packetSize} 字节)</div>`;
|
||||
|
||||
return parseResult;
|
||||
}
|
||||
}
|
||||
|
||||
customElements.define('network-monitor', NetworkMonitor);
|
||||
customElements.define('network-monitor', NetworkMonitor);
|
@ -55,21 +55,17 @@ router.post('/start', (req, res) => {
|
||||
udpServer.on('message', (msg, rinfo) => {
|
||||
// 将收到的数据添加到数据队列
|
||||
try {
|
||||
let processedData;
|
||||
|
||||
// 尝试将数据解析为JSON
|
||||
try {
|
||||
processedData = JSON.parse(msg.toString());
|
||||
} catch (e) {
|
||||
// 如果不是JSON,则保存为字符串
|
||||
processedData = msg.toString();
|
||||
}
|
||||
// 保存原始字节数据,转换为十六进制字符串
|
||||
const hexData = msg.toString('hex');
|
||||
const rawBytes = Array.from(msg);
|
||||
|
||||
// 将数据添加到队列
|
||||
udpData.push({
|
||||
timestamp: Date.now(),
|
||||
source: `${rinfo.address}:${rinfo.port}`,
|
||||
data: processedData
|
||||
data: hexData,
|
||||
rawBytes: rawBytes,
|
||||
length: msg.length
|
||||
});
|
||||
|
||||
// 限制数据队列大小,最多保存1000条记录
|
||||
|
@ -233,10 +233,7 @@ function saveNewVersion(db, versionData) {
|
||||
versionData.DataPackageEntryPoint || '',
|
||||
versionData.DataPackageInterfaceName || '',
|
||||
versionData.ConfID,
|
||||
versionData.CmdList || '[]',
|
||||
versionData.ClassName,
|
||||
versionData.originalVersion || versionData.Version,
|
||||
versionData.PlaneName
|
||||
versionData.CmdList || '[]'
|
||||
);
|
||||
|
||||
return {
|
||||
|
Loading…
x
Reference in New Issue
Block a user