mirror of
https://github.com/Kpa-clawbot/meshcore-analyzer.git
synced 2026-06-05 09:41:39 +00:00
3364eed303
Rebased version of #968 (which was itself a rebase of #905) — resolves merge conflict with #906 (clock-skew UI) that landed on master. ## Conflict resolution **`public/observers.js`** — master (#906) added "Clock Offset" column to observer table; #968 split "Last Seen" into "Last Status" + "Last Packet" columns. Combined both: the table now has Status | Name | Region | Last Status | Last Packet | Packets | Packets/Hour | Clock Offset | Uptime. ## What this PR adds (unchanged from #968/#905) - `last_packet_at` column in observers DB table - Separate "Last Status Update" and "Last Packet Observation" display in observers list and detail page - Server-side migration to add the column automatically - Backfill heuristic for existing data - Tests for ingestor and server ## Verification - All Go tests pass (`cmd/server`, `cmd/ingestor`) - Frontend tests pass (`test-packets.js`, `test-hash-color.js`) - Built server, hit `/api/observers` — `last_packet_at` field present in JSON - Observer table header has all 9 columns including both Last Packet and Clock Offset ## Prior PRs - #905 — original (conflicts with master) - #968 — first rebase (conflicts after #906 landed) - This PR — second rebase, resolves #906 conflict Supersedes #968. Closes #905. --------- Co-authored-by: you <you@example.com>
356 lines
15 KiB
JavaScript
356 lines
15 KiB
JavaScript
/* === CoreScope — observer-detail.js === */
|
|
'use strict';
|
|
(function () {
|
|
const PAYLOAD_LABELS = { 0: 'Request', 1: 'Response', 2: 'Direct Msg', 3: 'ACK', 4: 'Advert', 5: 'Channel Msg', 7: 'Anon Req', 8: 'Path', 9: 'Trace', 11: 'Control' };
|
|
const CHART_COLORS = ['#4a9eff', '#ff6b6b', '#51cf66', '#fcc419', '#cc5de8', '#20c997', '#ff922b', '#845ef7', '#f06595', '#339af0'];
|
|
|
|
let charts = [];
|
|
let currentDays = 7;
|
|
let currentId = null;
|
|
|
|
function destroyCharts() {
|
|
charts.forEach(c => { try { c.destroy(); } catch {} });
|
|
charts = [];
|
|
}
|
|
|
|
function chartDefaults() {
|
|
const style = getComputedStyle(document.documentElement);
|
|
Chart.defaults.color = style.getPropertyValue('--text-muted').trim() || '#6b7280';
|
|
Chart.defaults.borderColor = style.getPropertyValue('--border').trim() || '#e2e5ea';
|
|
}
|
|
|
|
function formatDuration(secs) {
|
|
if (!secs) return '—';
|
|
const d = Math.floor(secs / 86400);
|
|
const h = Math.floor((secs % 86400) / 3600);
|
|
const m = Math.floor((secs % 3600) / 60);
|
|
if (d > 0) return d + 'd ' + h + 'h';
|
|
if (h > 0) return h + 'h ' + m + 'm';
|
|
return m + 'm';
|
|
}
|
|
|
|
function init(app, routeParam) {
|
|
currentId = routeParam;
|
|
if (!currentId) {
|
|
app.innerHTML = '<div class="text-center text-muted" style="padding:40px">No observer ID specified.</div>';
|
|
return;
|
|
}
|
|
|
|
app.innerHTML = `
|
|
<div class="observer-detail-page" style="padding:16px">
|
|
<div class="page-header" style="display:flex;align-items:center;gap:12px;margin-bottom:16px">
|
|
<a href="#/observers" class="btn-icon" title="Back to Observers" aria-label="Back">←</a>
|
|
<h2 style="margin:0" id="obsTitle">Observer Detail</h2>
|
|
<div style="margin-left:auto;display:flex;gap:8px">
|
|
<select id="obsDaysSelect" class="time-range-select" aria-label="Time range">
|
|
<option value="1">24 Hours</option>
|
|
<option value="3">3 Days</option>
|
|
<option value="7" selected>7 Days</option>
|
|
<option value="30">30 Days</option>
|
|
</select>
|
|
</div>
|
|
</div>
|
|
<div id="obsDetailContent"><div class="text-center text-muted" style="padding:40px">Loading…</div></div>
|
|
</div>`;
|
|
|
|
document.getElementById('obsDaysSelect').addEventListener('change', function (e) {
|
|
currentDays = parseInt(e.target.value);
|
|
loadDetail();
|
|
});
|
|
|
|
loadDetail();
|
|
}
|
|
|
|
function destroy() {
|
|
destroyCharts();
|
|
currentId = null;
|
|
}
|
|
|
|
async function loadDetail() {
|
|
try {
|
|
destroyCharts();
|
|
chartDefaults();
|
|
const [obs, analytics, obsSkewArr] = await Promise.all([
|
|
api('/observers/' + encodeURIComponent(currentId)),
|
|
api('/observers/' + encodeURIComponent(currentId) + '/analytics?days=' + currentDays),
|
|
api('/observers/clock-skew', { ttl: 30000 }).catch(function() { return []; }),
|
|
]);
|
|
// Find this observer's calibration data.
|
|
var obsSkew = null;
|
|
(Array.isArray(obsSkewArr) ? obsSkewArr : []).forEach(function(s) {
|
|
if (s && s.observerID === currentId) obsSkew = s;
|
|
});
|
|
renderDetail(obs, analytics, obsSkew);
|
|
} catch (e) {
|
|
document.getElementById('obsDetailContent').innerHTML =
|
|
'<div class="text-muted" style="padding:40px">Error: ' + e.message + '</div>';
|
|
}
|
|
}
|
|
|
|
function renderDetail(obs, analytics, obsSkew) {
|
|
const el = document.getElementById('obsDetailContent');
|
|
if (!el) return;
|
|
|
|
const title = document.getElementById('obsTitle');
|
|
if (title) title.textContent = obs.name || obs.id.substring(0, 16) + '…';
|
|
|
|
// Parse radio string
|
|
let radioHtml = '—';
|
|
if (obs.radio) {
|
|
const rp = obs.radio.split(',');
|
|
radioHtml = rp[0] + ' MHz · SF' + (rp[2] || '?') + ' · BW' + (rp[1] || '?') + ' · CR' + (rp[3] || '?');
|
|
}
|
|
|
|
// Health status
|
|
const ago = obs.last_seen ? Date.now() - new Date(obs.last_seen).getTime() : Infinity;
|
|
const statusCls = ago < 600000 ? 'health-green' : ago < HEALTH_THRESHOLDS.nodeDegradedMs ? 'health-yellow' : 'health-red';
|
|
const statusLabel = ago < 600000 ? 'Online' : ago < HEALTH_THRESHOLDS.nodeDegradedMs ? 'Stale' : 'Offline';
|
|
|
|
el.innerHTML = `
|
|
<div class="obs-info-grid" style="display:grid;grid-template-columns:repeat(auto-fit,minmax(200px,1fr));gap:12px;margin-bottom:20px">
|
|
<div class="stat-card">
|
|
<div class="stat-label">Status</div>
|
|
<div class="stat-value"><span class="health-dot ${statusCls}">●</span> ${statusLabel}</div>
|
|
</div>
|
|
<div class="stat-card">
|
|
<div class="stat-label">Region</div>
|
|
<div class="stat-value">${obs.iata ? '<span class="badge-region">' + obs.iata + '</span>' : '—'}</div>
|
|
</div>
|
|
<div class="stat-card">
|
|
<div class="stat-label">Model</div>
|
|
<div class="stat-value">${obs.model || '—'}</div>
|
|
</div>
|
|
<div class="stat-card">
|
|
<div class="stat-label">Firmware</div>
|
|
<div class="stat-value" style="font-size:0.8em;word-break:break-all">${obs.firmware || '—'}</div>
|
|
</div>
|
|
<div class="stat-card">
|
|
<div class="stat-label">Client</div>
|
|
<div class="stat-value" style="font-size:0.8em;word-break:break-all">${obs.client_version || '—'}</div>
|
|
</div>
|
|
<div class="stat-card">
|
|
<div class="stat-label">Radio</div>
|
|
<div class="stat-value" style="font-size:0.85em">${radioHtml}</div>
|
|
</div>
|
|
<div class="stat-card">
|
|
<div class="stat-label">Battery</div>
|
|
<div class="stat-value">${obs.battery_mv ? obs.battery_mv + ' mV' : '—'}</div>
|
|
</div>
|
|
<div class="stat-card">
|
|
<div class="stat-label">Uptime</div>
|
|
<div class="stat-value">${formatDuration(obs.uptime_secs)}</div>
|
|
</div>
|
|
<div class="stat-card">
|
|
<div class="stat-label">Noise Floor</div>
|
|
<div class="stat-value">${obs.noise_floor != null ? obs.noise_floor + ' dBm' : '—'}</div>
|
|
</div>
|
|
<div class="stat-card">
|
|
<div class="stat-label">Total Packets</div>
|
|
<div class="stat-value">${(obs.packet_count || 0).toLocaleString()}</div>
|
|
</div>
|
|
<div class="stat-card">
|
|
<div class="stat-label">Packets/Hour</div>
|
|
<div class="stat-value">${(obs.packetsLastHour || 0).toLocaleString()}</div>
|
|
</div>
|
|
<div class="stat-card">
|
|
<div class="stat-label">First Seen</div>
|
|
<div class="stat-value" style="font-size:0.85em">${obs.first_seen ? new Date(obs.first_seen).toLocaleDateString() : '—'}</div>
|
|
</div>
|
|
<div class="stat-card">
|
|
<div class="stat-label">Last Status Update</div>
|
|
<div class="stat-value" style="font-size:0.85em">${obs.last_seen ? timeAgo(obs.last_seen) + '<br><span style="font-size:0.8em;color:var(--text-muted)">' + new Date(obs.last_seen).toLocaleString() + '</span>' : '—'}</div>
|
|
</div>
|
|
<div class="stat-card">
|
|
<div class="stat-label">Last Packet Observation</div>
|
|
<div class="stat-value" style="font-size:0.85em">${obs.last_packet_at ? timeAgo(obs.last_packet_at) + '<br><span style="font-size:0.8em;color:var(--text-muted)">' + new Date(obs.last_packet_at).toLocaleString() + '</span>' : '<span style="color:var(--text-muted)">never</span>'}</div>
|
|
</div>
|
|
</div>
|
|
<div class="mono" style="font-size:0.75em;color:var(--text-muted);margin-bottom:20px;word-break:break-all">
|
|
ID: ${obs.id}
|
|
</div>
|
|
${obsSkew && obsSkew.samples > 0 ? `
|
|
<div class="node-full-card skew-detail-section" style="margin-bottom:20px;padding:12px">
|
|
<h4 style="margin:0 0 6px">⏰ Clock Offset</h4>
|
|
<div style="display:flex;align-items:center;gap:12px;flex-wrap:wrap">
|
|
<span style="font-size:18px;font-weight:700;font-family:var(--mono)">${formatSkew(obsSkew.offsetSec)}</span>
|
|
${renderSkewBadge(observerSkewSeverity(obsSkew.offsetSec), obsSkew.offsetSec)}
|
|
<span class="text-muted" style="font-size:12px">${obsSkew.samples} sample${obsSkew.samples !== 1 ? 's' : ''}</span>
|
|
</div>
|
|
<div style="font-size:12px;color:var(--text-muted);margin-top:8px;max-width:600px">
|
|
<strong>How this is computed:</strong> when this observer and another observer see the same packet, we compare their receive timestamps. The median deviation across all multi-observer packets is this observer's offset.
|
|
</div>
|
|
</div>` : ''}
|
|
<div class="obs-charts" style="display:grid;grid-template-columns:repeat(auto-fit,minmax(400px,1fr));gap:16px">
|
|
<div class="chart-card" style="padding:12px">
|
|
<h3 style="margin:0 0 8px;font-size:0.95em">Packets Over Time</h3>
|
|
<canvas id="obsTimeChart" role="img" aria-label="Packets over time chart"></canvas>
|
|
</div>
|
|
<div class="chart-card" style="padding:12px">
|
|
<h3 style="margin:0 0 8px;font-size:0.95em">Packet Types</h3>
|
|
<div style="max-width:280px;margin:0 auto"><canvas id="obsTypeChart" role="img" aria-label="Packet types chart"></canvas></div>
|
|
</div>
|
|
<div class="chart-card" style="padding:12px">
|
|
<h3 style="margin:0 0 8px;font-size:0.95em">Unique Nodes Heard</h3>
|
|
<canvas id="obsNodesChart" role="img" aria-label="Unique nodes heard chart"></canvas>
|
|
</div>
|
|
<div class="chart-card" style="padding:12px">
|
|
<h3 style="margin:0 0 8px;font-size:0.95em">SNR Distribution</h3>
|
|
<canvas id="obsSnrChart" role="img" aria-label="SNR distribution chart"></canvas>
|
|
</div>
|
|
</div>
|
|
<div style="margin-top:20px">
|
|
<h3 style="font-size:0.95em">Recent Packets</h3>
|
|
<div id="obsRecentPackets"><div class="text-muted">Loading…</div></div>
|
|
</div>`;
|
|
|
|
// Render charts
|
|
if (analytics.timeline && analytics.timeline.length > 0) {
|
|
renderTimelineChart(analytics.timeline);
|
|
}
|
|
if (analytics.packetTypes) {
|
|
renderTypeChart(analytics.packetTypes);
|
|
}
|
|
if (analytics.nodesTimeline && analytics.nodesTimeline.length > 0) {
|
|
renderNodesChart(analytics.nodesTimeline);
|
|
}
|
|
if (analytics.snrDistribution && analytics.snrDistribution.length > 0) {
|
|
renderSnrChart(analytics.snrDistribution);
|
|
}
|
|
if (analytics.recentPackets) {
|
|
renderRecentPackets(analytics.recentPackets);
|
|
}
|
|
}
|
|
|
|
function renderTimelineChart(timeline) {
|
|
const ctx = document.getElementById('obsTimeChart');
|
|
if (!ctx) return;
|
|
const c = new Chart(ctx, {
|
|
type: 'bar',
|
|
data: {
|
|
labels: timeline.map(t => t.label),
|
|
datasets: [{
|
|
label: 'Packets',
|
|
data: timeline.map(t => t.count),
|
|
backgroundColor: CHART_COLORS[0] + '80',
|
|
borderColor: CHART_COLORS[0],
|
|
borderWidth: 1,
|
|
}]
|
|
},
|
|
options: {
|
|
responsive: true, maintainAspectRatio: true,
|
|
plugins: { legend: { display: false } },
|
|
scales: {
|
|
x: { ticks: { maxRotation: 45, autoSkip: true, maxTicksLimit: 12 } },
|
|
y: { beginAtZero: true, ticks: { precision: 0 } }
|
|
}
|
|
}
|
|
});
|
|
charts.push(c);
|
|
}
|
|
|
|
function renderTypeChart(types) {
|
|
const ctx = document.getElementById('obsTypeChart');
|
|
if (!ctx) return;
|
|
const labels = Object.keys(types).map(k => PAYLOAD_LABELS[k] || 'Type ' + k);
|
|
const values = Object.values(types);
|
|
const c = new Chart(ctx, {
|
|
type: 'doughnut',
|
|
data: {
|
|
labels: labels,
|
|
datasets: [{ data: values, backgroundColor: CHART_COLORS.slice(0, labels.length) }]
|
|
},
|
|
options: {
|
|
responsive: true, maintainAspectRatio: true,
|
|
plugins: { legend: { position: 'bottom', labels: { boxWidth: 12 } } }
|
|
}
|
|
});
|
|
charts.push(c);
|
|
}
|
|
|
|
function renderNodesChart(timeline) {
|
|
const ctx = document.getElementById('obsNodesChart');
|
|
if (!ctx) return;
|
|
const c = new Chart(ctx, {
|
|
type: 'line',
|
|
data: {
|
|
labels: timeline.map(t => t.label),
|
|
datasets: [{
|
|
label: 'Unique Nodes',
|
|
data: timeline.map(t => t.count),
|
|
borderColor: CHART_COLORS[2],
|
|
backgroundColor: CHART_COLORS[2] + '20',
|
|
fill: true, tension: 0.3, pointRadius: 2,
|
|
}]
|
|
},
|
|
options: {
|
|
responsive: true, maintainAspectRatio: true,
|
|
plugins: { legend: { display: false } },
|
|
scales: {
|
|
x: { ticks: { maxRotation: 45, autoSkip: true, maxTicksLimit: 12 } },
|
|
y: { beginAtZero: true, ticks: { precision: 0 } }
|
|
}
|
|
}
|
|
});
|
|
charts.push(c);
|
|
}
|
|
|
|
function renderSnrChart(distribution) {
|
|
const ctx = document.getElementById('obsSnrChart');
|
|
if (!ctx) return;
|
|
const c = new Chart(ctx, {
|
|
type: 'bar',
|
|
data: {
|
|
labels: distribution.map(d => d.range),
|
|
datasets: [{
|
|
label: 'Packets',
|
|
data: distribution.map(d => d.count),
|
|
backgroundColor: CHART_COLORS[3] + '80',
|
|
borderColor: CHART_COLORS[3],
|
|
borderWidth: 1,
|
|
}]
|
|
},
|
|
options: {
|
|
responsive: true, maintainAspectRatio: true,
|
|
plugins: { legend: { display: false } },
|
|
scales: {
|
|
x: { title: { display: true, text: 'SNR (dB)' } },
|
|
y: { beginAtZero: true, ticks: { precision: 0 } }
|
|
}
|
|
}
|
|
});
|
|
charts.push(c);
|
|
}
|
|
|
|
function renderRecentPackets(packets) {
|
|
const el = document.getElementById('obsRecentPackets');
|
|
if (!el || !packets.length) { if (el) el.innerHTML = '<div class="text-muted">No recent packets.</div>'; return; }
|
|
el.innerHTML = `<table class="data-table" style="font-size:0.85em">
|
|
<thead><tr><th scope="col">Time</th><th scope="col">Type</th><th scope="col">Hash</th><th scope="col">SNR</th><th scope="col">RSSI</th><th scope="col">Hops</th></tr></thead>
|
|
<tbody>${packets.map(p => {
|
|
const decoded = typeof p.decoded_json === 'string' ? JSON.parse(p.decoded_json) : (p.decoded_json || {});
|
|
const hops = typeof p.path_json === 'string' ? JSON.parse(p.path_json) : (p.path_json || []);
|
|
const typeName = PAYLOAD_LABELS[p.payload_type] || 'Type ' + p.payload_type;
|
|
return `<tr style="cursor:pointer" tabindex="0" role="row" data-action="navigate" data-value="#/packets/${p.hash || p.id}" onclick="location.hash='#/packets/${p.hash || p.id}'">
|
|
<td>${timeAgo(p.timestamp)}</td>
|
|
<td>${typeName}</td>
|
|
<td class="mono" style="font-size:0.85em">${(p.hash || '').substring(0, 10)}</td>
|
|
<td>${p.snr != null ? Number(p.snr).toFixed(1) : '—'}</td>
|
|
<td>${p.rssi != null ? p.rssi : '—'}</td>
|
|
<td>${hops.length}</td>
|
|
</tr>`;
|
|
}).join('')}</tbody>
|
|
</table>`;
|
|
|
|
// #209 — Keyboard accessibility for recent packet rows
|
|
el.addEventListener('keydown', function (e) {
|
|
var row = e.target.closest('tr[data-action="navigate"]');
|
|
if (!row) return;
|
|
if (e.key !== 'Enter' && e.key !== ' ') return;
|
|
e.preventDefault();
|
|
location.hash = row.dataset.value;
|
|
});
|
|
}
|
|
|
|
registerPage('observer-detail', { init, destroy });
|
|
})();
|