adam/mc-webui
1
0
Fork 0
mirror of https://github.com/MarekWo/mc-webui.git synced 2026-07-03 16:31:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(path_hash_mode): fix frontend hops display, path segmentation, echo badge

Browse Source 
Stage 3 of path_hash_mode support. All hardcoded 1-byte hash assumptions
removed from app.js — hops, path segments, and echo badges now use the
decoded hop_count and hash_size from the backend.

Changes in app.js:
- appendMessageFromSocket: pass hop_count, path_hash_size, echo_hash_sizes
- updateMessageMetaDOM: use hop_count instead of raw path_len for Hops
- updateMessageMetaDOM: segment paths by hash_size*2 chars, not fixed 2
- updateMessageMetaDOM: echo badge uses hash_size-aware prefix length
- createMessageElement: same fixes as updateMessageMetaDOM
- showPathsPopup: segment paths by hash_size, derive hops from segments

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
MarekWo
2026-03-30 10:22:57 +02:00
parent e8f271f4ef
commit 083c322741
1 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/static/js/app.js
+37 -10
View File
@@ -963,8 +963,11 @@ function appendMessageFromSocket(data) {
channel_idx: data.channel_idx,
snr: data.snr ?? null,
path_len: data.path_len ?? null,
hop_count: data.hop_count ?? null,
path_hash_size: data.path_hash_size ?? 1,
echo_paths: [],
echo_snrs: [],
echo_hash_sizes: [],
analyzer_url: data.analyzer_url || null,
pkt_payload: data.pkt_payload || null,
txt_type: data.txt_type || 0,
@@ -1029,8 +1032,9 @@ function updateMessageMetaDOM(wrapper, meta) {
if (displaySnr !== null) {
metaParts.push(`SNR: ${displaySnr.toFixed(1)} dB`);
}
if (meta.path_len !== undefined && meta.path_len !== null) {
metaParts.push(`Hops: ${meta.path_len}`);
const hopCount = meta.hop_count ?? (meta.path_len !== null && meta.path_len !== undefined ? (meta.path_len & 0x3F) : null);
if (hopCount !== null) {
metaParts.push(`Hops: ${hopCount}`);
}
// Build paths from echo data
@@ -1039,11 +1043,18 @@ function updateMessageMetaDOM(wrapper, meta) {
paths = meta.echo_paths.map((p, i) => ({
path: p,
snr: meta.echo_snrs ? meta.echo_snrs[i] : null,
hash_size: meta.echo_hash_sizes ? meta.echo_hash_sizes[i] : (meta.path_hash_size || 1),
}));
}
if (paths && paths.length > 0) {
const firstPath = paths[0];
const segments = firstPath.path ? firstPath.path.match(/.{1,2}/g) || [] : [];
const chunkLen = (firstPath.hash_size || 1) * 2;
const segments = [];
if (firstPath.path) {
for (let i = 0; i < firstPath.path.length; i += chunkLen) {
segments.push(firstPath.path.substring(i, i + chunkLen).toUpperCase());
}
}
const shortPath = segments.length > 4
? `${segments[0]}\u2192...\u2192${segments[segments.length - 1]}`
: segments.join('\u2192');
@@ -1088,7 +1099,8 @@ function updateMessageMetaDOM(wrapper, meta) {
// Update echo badge
if (meta.echo_paths && meta.echo_paths.length > 0) {
const echoPaths = [...new Set(meta.echo_paths.map(p => p.substring(0, 2)))];
const echoPrefixLen = (meta.path_hash_size || 1) * 2;
const echoPaths = [...new Set(meta.echo_paths.map(p => p.substring(0, echoPrefixLen).toUpperCase()))];
const echoCount = echoPaths.length;
const pathDisplay = echoPaths.length > 0 ? ` (${echoPaths.join(', ')})` : '';
const actionsEl = msgDiv.querySelector('.message-actions');
@@ -1135,6 +1147,7 @@ function createMessageElement(msg) {
msg.paths = msg.echo_paths.map((p, i) => ({
path: p,
snr: msg.echo_snrs ? msg.echo_snrs[i] : null,
hash_size: msg.echo_hash_sizes ? msg.echo_hash_sizes[i] : (msg.path_hash_size || 1),
}));
}
@@ -1145,13 +1158,20 @@ function createMessageElement(msg) {
if (displaySnr !== null) {
metaParts.push(`SNR: ${displaySnr.toFixed(1)} dB`);
}
if (msg.path_len !== undefined && msg.path_len !== null) {
metaParts.push(`Hops: ${msg.path_len}`);
const msgHopCount = msg.hop_count ?? (msg.path_len !== null && msg.path_len !== undefined ? (msg.path_len & 0x3F) : null);
if (msgHopCount !== null) {
metaParts.push(`Hops: ${msgHopCount}`);
}
if (msg.paths && msg.paths.length > 0) {
// Show first path inline (shortest/first arrival)
const firstPath = msg.paths[0];
const segments = firstPath.path ? firstPath.path.match(/.{1,2}/g) || [] : [];
const chunkLen = (firstPath.hash_size || 1) * 2;
const segments = [];
if (firstPath.path) {
for (let i = 0; i < firstPath.path.length; i += chunkLen) {
segments.push(firstPath.path.substring(i, i + chunkLen).toUpperCase());
}
}
const shortPath = segments.length > 4
? `${segments[0]}\u2192...\u2192${segments[segments.length - 1]}`
: segments.join('\u2192');
@@ -1164,7 +1184,8 @@ function createMessageElement(msg) {
if (msg.is_own) {
// Own messages: right-aligned, no avatar
// Echo badge shows unique repeaters that heard the message + their path codes
const echoPaths = [...new Set((msg.echo_paths || []).map(p => p.substring(0, 2)))];
const echoPrefixLen2 = (msg.path_hash_size || 1) * 2;
const echoPaths = [...new Set((msg.echo_paths || []).map(p => p.substring(0, echoPrefixLen2).toUpperCase()))];
const echoCount = echoPaths.length;
const pathDisplay = echoPaths.length > 0 ? ` (${echoPaths.join(', ')})` : '';
const echoDisplay = echoCount > 0
@@ -1471,10 +1492,16 @@ function showPathsPopup(element, encodedPaths) {
let html = '';
paths.forEach((p, i) => {
const segments = p.path ? p.path.match(/.{1,2}/g) || [] : [];
const pChunkLen = (p.hash_size || 1) * 2;
const segments = [];
if (p.path) {
for (let j = 0; j < p.path.length; j += pChunkLen) {
segments.push(p.path.substring(j, j + pChunkLen).toUpperCase());
}
}
const fullRoute = segments.join(' \u2192 ');
const snr = p.snr !== null && p.snr !== undefined ? `${p.snr.toFixed(1)} dB` : '?';
const hops = p.path_len !== null && p.path_len !== undefined ? p.path_len : segments.length;
const hops = segments.length;
html += `<div class="path-entry">${fullRoute}<span class="path-detail">SNR: ${snr} | Hops: ${hops}</span></div>`;
});