接続
@@ -2293,6 +2381,15 @@ if ('serviceWorker' in navigator) {
}
// ── Health check ───────────────────────────────────────────────
+function formatUptime(seconds) {
+ const d = Math.floor(seconds / 86400);
+ const h = Math.floor((seconds % 86400) / 3600);
+ const m = Math.floor((seconds % 3600) / 60);
+ if (d > 0) return `${d}d ${h}h`;
+ if (h > 0) return `${h}h ${m}m`;
+ return `${m}m`;
+}
+
async function checkNodeHealth(nodeId, url) {
const btn = document.getElementById('dp-health-btn');
const dot = document.getElementById('dp-health-dot');
@@ -2301,16 +2398,69 @@ async function checkNodeHealth(nodeId, url) {
label.textContent = '確認中...';
dot.className = 'health-dot';
+ // メトリクスパネルを非表示にリセット
+ const metricsEl = document.getElementById('dp-metrics');
+ metricsEl.classList.remove('visible');
+
+ const node = atlasData.nodes.find(n => n.id === nodeId);
+ const healthUrl = (node && node.health_url) ? node.health_url : null;
+
let result = 'offline';
- try {
- const ctrl = new AbortController();
- const timer = setTimeout(() => ctrl.abort(), 6000);
- const res = await fetch(url, { method: 'HEAD', mode: 'no-cors', signal: ctrl.signal });
- clearTimeout(timer);
- // no-cors returns opaque (type='opaque', status=0) — server was reached
- result = res.type === 'opaque' ? 'limited' : (res.ok ? 'online' : 'offline');
- } catch (e) {
- result = 'offline';
+
+ // /api/health があればメトリクス取得を試みる
+ if (healthUrl) {
+ try {
+ const ctrl = new AbortController();
+ const timer = setTimeout(() => ctrl.abort(), 6000);
+ const res = await fetch(healthUrl, { signal: ctrl.signal });
+ clearTimeout(timer);
+ if (res.ok) {
+ const data = await res.json();
+ result = data.ok ? 'online' : 'limited';
+
+ // メトリクス描画
+ const cpuPct = data.cpu_pct || 0;
+ const memPct = Math.round((data.mem_used_mb / data.mem_total_mb) * 100) || 0;
+ document.getElementById('metric-cpu-val').textContent = `${cpuPct}%`;
+ const cpuBar = document.getElementById('metric-cpu-bar');
+ cpuBar.style.width = `${cpuPct}%`;
+ cpuBar.className = 'metric-bar-fill' + (cpuPct > 80 ? ' crit' : cpuPct > 60 ? ' warn' : '');
+
+ document.getElementById('metric-mem-val').textContent =
+ `${data.mem_used_mb} / ${data.mem_total_mb} MB (${memPct}%)`;
+ const memBar = document.getElementById('metric-mem-bar');
+ memBar.style.width = `${memPct}%`;
+ memBar.className = 'metric-bar-fill' + (memPct > 85 ? ' crit' : memPct > 65 ? ' warn' : '');
+
+ document.getElementById('metric-uptime').textContent =
+ formatUptime(data.uptime_s || 0);
+ document.getElementById('metric-sessions').textContent =
+ `${data.active_sessions || 0} 本`;
+
+ if (node.url) {
+ const openLink = document.getElementById('metric-open-link');
+ openLink.href = node.url;
+ }
+
+ metricsEl.classList.add('visible');
+ if (window.lucide) lucide.createIcons({ nodes: [metricsEl] });
+ } else {
+ result = 'offline';
+ }
+ } catch (e) {
+ result = 'offline';
+ }
+ } else {
+ // /api/health なし → 従来の HEAD リクエスト
+ try {
+ const ctrl = new AbortController();
+ const timer = setTimeout(() => ctrl.abort(), 6000);
+ const res = await fetch(url, { method: 'HEAD', mode: 'no-cors', signal: ctrl.signal });
+ clearTimeout(timer);
+ result = res.type === 'opaque' ? 'limited' : (res.ok ? 'online' : 'offline');
+ } catch (e) {
+ result = 'offline';
+ }
}
const labelMap = { online: 'online', limited: '到達可能', offline: '到達不可' };
@@ -2318,8 +2468,6 @@ async function checkNodeHealth(nodeId, url) {
label.textContent = labelMap[result];
btn.classList.remove('checking');
- // Update node status in data
- const node = atlasData.nodes.find(n => n.id === nodeId);
if (node) {
node.status = result === 'offline' ? 'inactive' : 'active';
saveData();