dsh-mesh-ui 0.0.6 → 0.0.8

package/lib/client.js

@@ -42,7 +42,7 @@ window.__ModuleLoader__.load({
       var type = deviceType(name)
       return type ? label + ' · ' + type : label
     }
-      // 同一台设备可能有多个 peer 记录（不同 token/入口：phone-node / phone-node-lan / phone-node-exec）。
+      // 同一台设备可能有多个 peer 记录（不同 token/入口：peer-node / peer-node-lan / peer-node-exec）。
   // AI 网络拓扑按「设备」展示：去掉后缀归并，取可达且延迟最优的那条。
   var PEER_SUFFIX = /-(lan|wan|exec|exe|import|local|ctl)$/i
   function peerDeviceKey(name) {
@@ -96,6 +96,7 @@ function nodeLabel(name) { return NODE_LABELS[String(name || '').toLowerCase()]
       return keys
     }
     // 2026-11-10：用户手工调整后认可的默认布局（世界坐标，10000×6000 画布内）
+    // 设备按设备名（home/peer-node/company/peer-node/peer-node）映射，各机通用；服务器两张卡单独一张表
     var DEFAULT_DEVICE_POS = {}
     var DEFAULT_INFRA_POS = {
       aliyun: [4887.59, 2856.78],
@@ -677,7 +678,7 @@ body.light .dm-edge-label { stroke: rgba(255,255,255,.92); }
             h('span', null, '⋯')
           )
         ),
-        h('div', { className: 'dm-hint' }, '拓扑 v17 · 内容 ' + Math.round(layout.W) + '×' + Math.round(layout.H) + 'px · 卡 ' + Math.round(layout.cardW) + '×' + Math.round(layout.cardH) + ' · 缩放 ' + Math.round(view.scale * 100) + '% · 滚轮缩放 / 拖拽平移')
+        h('div', { className: 'dm-hint' }, '拓扑 v19 · 内容 ' + Math.round(layout.W) + '×' + Math.round(layout.H) + 'px · 卡 ' + Math.round(layout.cardW) + '×' + Math.round(layout.cardH) + ' · 缩放 ' + Math.round(view.scale * 100) + '% · 滚轮缩放 / 拖拽平移')
       )
     }
 
@@ -811,6 +812,7 @@ var DOWN_COLOR = "rgba(209,75,65,.7)"
 // 各机 DSH 安装形态（实测/档案）
 var DEVICE_DSH = {}
 function dshTypesFor(devKey) { return DEVICE_DSH[peerDeviceKey(devKey)] || [] }
+// LAN peer 判定：-lan 后缀 / 内网 IP / kind=lan（实际数据里 peer-node-lan 的 kind 是 frp）
 function isLanPeer(peer) {
   var t = (peer && peer.tunnel) || {}
   var name = String((peer && peer.name) || '')
@@ -835,9 +837,11 @@ function sakuraTunnelOf(data, devKey) {
 function deviceLinkState(data, peer, lanMap) {
   var dk = peerDeviceKey(peer.name)
   var t = peer.tunnel || {}
-  var publicUp = Boolean(peer.up)
+  // 2026-11-10：蓝线状态以隧道端口 TCP 探测为准（HTTP /health 对高延迟节点会误判断连）
+  var probe = t.probe && typeof t.probe.up === "boolean" ? t.probe : null
+  var publicUp = (probe ? probe.up === true : false) || Boolean(peer.up)
   var lan = lanMap ? lanMap[dk] : (t.kind === 'lan' ? { up: Boolean(peer.up), host: t.host, port: t.port, ip: t.ip || '' } : null)
-  var lanUp = Boolean(lan && lan.up)
+  var lanUp = Boolean(lan && (lan.probe && lan.probe.up === true ? true : lan.up))
   var st = sakuraTunnelOf(data, dk)
   var sakuraUp = st ? st.online === true : null
   var anyUp = publicUp || sakuraUp === true || lanUp
@@ -858,7 +862,7 @@ function deviceLinkState(data, peer, lanMap) {
       var localKey = peerDeviceKey(data.nodeName)
       var devs = [{ devKey: localKey, name: nodeDisplay(data.nodeName) + "（本机）", up: true, port: localPort, host: localHost }].concat(peers.filter(function (p) { return !isLanPeer(p) }).map(function (p) {
         var tu = p.tunnel || {}
-        return { devKey: peerDeviceKey(p.name), name: nodeDisplay(peerDeviceKey(p.name)), up: Boolean(p.up), port: tu.port || null, host: tu.host || 'relay.example.com' }
+        return { devKey: peerDeviceKey(p.name), name: nodeDisplay(peerDeviceKey(p.name)), up: (tu.probe ? Boolean(tu.probe.up) : Boolean(p.up)), port: tu.port || null, host: tu.host || 'relay.example.com' }
       }))
       var aliyunRows = devs.filter(function (d) { return d.port }).map(function (d) {
         return h('div', { key: d.devKey, className: 'dm-device-row' },
@@ -997,7 +1001,7 @@ function deviceLinkState(data, peer, lanMap) {
   var lanMap = {}
   filterSelfPeers(data.peers || [], data.nodeName).forEach(function (p) {
     var t = p.tunnel || {}
-    if (isLanPeer(p)) lanMap[peerDeviceKey(p.name)] = { up: Boolean(p.up), host: t.host, port: t.port, ip: t.ip || '' }
+    if (isLanPeer(p)) lanMap[peerDeviceKey(p.name)] = { up: Boolean(p.up), host: t.host, port: t.port, ip: t.ip || '', probe: t.probe || null }
   })
   var nodes = [{
     key: 'local',
@@ -1418,17 +1422,62 @@ function deviceLinkState(data, peer, lanMap) {
       var s2 = useState(''); var error = s2[0]; var setError = s2[1]
       var s3 = useState(0); var tick = s3[0]; var setTick = s3[1]
       var s4 = useState(''); var copied = s4[0]; var setCopied = s4[1]
+      // 2026-11-10：真刷新 —— 点击后等待后台采集完成再渲染；本地冷却 + 忙锁防止连点刷爆请求
+      var s6 = useState(""); var refreshHint = s6[0]; var setRefreshHint = s6[1]
+      var forceRef = useRef({ at: 0, busy: false })
       var s5 = useState('local'); var selectedKey = s5[0]; var setSelectedKey = s5[1]
 
       function load(force) {
+        if (!force) {
+          setLoading(true)
+          fetchStatus(false)
+            .then(function (json) {
+              setData(json)
+              setError(json && json.ok === false && !json.warming ? json.error || "mesh-health error" : "")
+            })
+            .catch(function (err) { setError(String((err && err.message) || err)) })
+            .finally(function () { setLoading(false) })
+          return
+        }
+        var st = forceRef.current
+        var now = Date.now()
+        if (st.busy) return
+        if (now - st.at < 8000) {
+          var waitSec = Math.ceil((8000 - (now - st.at)) / 1000)
+          setRefreshHint("刚采集过，" + waitSec + "s 后可再刷新")
+          setTimeout(function () { setRefreshHint("") }, 2200)
+          return
+        }
+        st.busy = true
+        st.at = now
         setLoading(true)
-        fetchStatus(Boolean(force))
-          .then(function (json) {
-            setData(json)
-            setError(json && json.ok === false && !json.warming ? json.error || 'mesh-health error' : '')
+        setRefreshHint("采集中…")
+        var prevAt = data && data.at
+        var attempts = 0
+        function poll() {
+          attempts++
+          fetchStatus(false).then(function (json) {
+            var fresh = json && json.refreshing === false && json.at && json.at !== prevAt
+            if (fresh || attempts >= 15) {
+              setData(json)
+              setError(json && json.ok === false && !json.warming ? json.error || "mesh-health error" : "")
+              setLoading(false)
+              st.busy = false
+              setRefreshHint(fresh ? "已刷新" : "无新数据（采集超时）")
+              setTimeout(function () { setRefreshHint("") }, 2000)
+              return
+            }
+            setTimeout(poll, 800)
+          }).catch(function () {
+            st.busy = false
+            setLoading(false)
+            setRefreshHint("刷新失败")
+            setTimeout(function () { setRefreshHint("") }, 2500)
           })
-          .catch(function (err) { setError(String((err && err.message) || err)) })
-          .finally(function () { setLoading(false) })
+        }
+        fetchStatus(true)
+          .catch(function () { /* continue polling */ })
+          .then(function () { setTimeout(poll, 500) })
       }
 
       useEffect(function () {
@@ -1437,7 +1486,7 @@ function deviceLinkState(data, peer, lanMap) {
         return function () { clearInterval(timer) }
       }, [])
 
-      useEffect(function () { if (tick > 0) load(false) }, [tick])
+      useEffect(function () { if (tick > 0 && !forceRef.current.busy) load(false) }, [tick])
 
       function copyJson() {
         var text = JSON.stringify(data || {}, null, 2)
@@ -1468,7 +1517,8 @@ function deviceLinkState(data, peer, lanMap) {
           h('span', { style: { flex: 1 } }),
           h('a', { className: 'dm-btn', href: API, target: '_blank', rel: 'noreferrer', style: { textDecoration: 'none' } }, '原始 JSON'),
           h('button', { className: 'dm-btn', onClick: copyJson }, copied || '复制诊断'),
-          h('button', { className: 'dm-btn primary', onClick: function () { load(true) } }, loading ? '刷新中…' : '刷新')
+          h('button', { className: 'dm-btn primary', onClick: function () { load(true) }, title: '立即采集一次并等待新快照（8s 冷却）' }, loading ? '采集中…' : '刷新'),
+          refreshHint ? h('span', { className: 'dm-sub' }, refreshHint) : null
         ),
         error ? h('div', { className: 'dm-err' }, error) : null,
 
@@ -1971,6 +2021,7 @@ body[data-ds-dark-theme] .dm-dg-fs-item.active { background:rgba(88,166,255,.28)
             loading ? h('span', { className: 'dm-dg-loading' }, h('span', { className: 'dm-dg-spin' }), '刷新中') : '刷新')
         ),
         notice ? h('div', { className: 'dm-dg-notice ' + notice.type }, notice.text) : null,
+        selected && selected.staleActive ? h('div', { className: 'dm-dg-notice warn' }, '该任务已超过 ' + Math.round(selected.staleAfterSec / 60) + ' 分钟没有更新，可能已失联；可点「刷新状态」再查对端，或重新发起委托。') : null,
         h('div', { className: 'dm-dg-body', style: { '--dm-dg-list-w': listWidth + 'px' } },
           h('section', { className: 'dm-dg-pane' },
             h('div', { className: 'dm-dg-pane-head' }, '委托列表', h('span', { className: 'dm-dg-sub' }, '(' + visibleTasks.length + (visibleTasks.length !== tasks.length ? '/' + tasks.length : '') + ')')),
@@ -1992,7 +2043,7 @@ body[data-ds-dark-theme] .dm-dg-fs-item.active { background:rgba(88,166,255,.28)
                   key: task.taskId,
                   className: 'dm-dg-row ' + tone + (task.taskId === selectedId ? ' active' : ''),
                   onClick: function () { if (task.taskId !== selectedId) selectTask(task) },
-                  title: task.goal || ''
+                  title: task.staleActive ? '超过 ' + Math.round(task.staleAfterSec / 60) + ' 分钟无更新（疑似失联，可点刷新状态）' : (task.goal || '')
                 },
                   h('div', { className: 'dm-dg-row-top' },
                     task.activeFresh ? h(LoadingSpinner, { size: 12 }) : null,
@@ -2002,7 +2053,7 @@ body[data-ds-dark-theme] .dm-dg-fs-item.active { background:rgba(88,166,255,.28)
                       h('span', { className: 'dm-dg-arrow' }, '→'),
                       h('span', { className: 'dm-dg-to' }, (task.nodeLabel || task.node || '?') + (task.instance ? ' · ' + task.instance : ''))
                     ),
-                    dgChip(task.state),
+                    dgChip(task.displayState || task.state),
                     h('span', { className: 'dm-dg-row-time' }, (task.isActive ? '更新 ' : '完成 ') + dgClock(task.displayAt || task.updatedAt))
                   ),
                   h('div', { className: 'dm-dg-goal' }, task.goal || '(无目标)'),
@@ -2036,7 +2087,7 @@ body[data-ds-dark-theme] .dm-dg-fs-item.active { background:rgba(88,166,255,.28)
                         h('span', { className: 'dm-dg-k' }, '状态'),
                         h('span', { className: 'dm-dg-v' },
                           selected.activeFresh ? h(LoadingSpinner, { size: 13 }) : null,
-                          dgChip(selected.state)
+                          dgChip(selected.displayState || selected.state)
                         )
                       ),
                       kv('委托方', (selected.fromLabel || selected.from || '—') + ((selected.fromIsLocal || (localNode && selected.from === localNode)) ? '（本机）' : '')),

package/lib/collect.js

@@ -16,6 +16,7 @@
 import { execFile } from 'node:child_process'
 import { existsSync, readdirSync, readFileSync, statfsSync, writeFileSync } from 'node:fs'
 import { lookup as dnsLookup } from 'node:dns/promises'
+import { connect as netConnect } from 'node:net'
 import { arch as osArch, cpus as osCpus, freemem as osFreemem, homedir, platform as osPlatform, release as osRelease, totalmem as osTotalmem } from 'node:os'
 import { join } from 'node:path'
 
@@ -505,6 +506,36 @@ export async function collect(repo) {
     } catch { /* 解析失败则保持主机名 */ }
   }))
 
+  // 2026-11-10：为每条 peer 隧道做 TCP 端口探测（阿里云 701x / LAN 8124），面板连线状态以此为准，
+  // 而不是用 peer.up（HTTP /health 探测，高延迟节点偶发超时会造成"隧道通却显示断连"的误判）
+  function tcpProbe(host, port, timeoutMs) {
+    return new Promise((resolve) => {
+      const started = Date.now()
+      let done = false
+      const socket = netConnect({ host, port })
+      const finish = (up, error) => {
+        if (done) return
+        done = true
+        try { socket.destroy() } catch { /* ignore */ }
+        resolve({ up, latencyMs: Date.now() - started, error: up ? null : error || "timeout" })
+      }
+      socket.setTimeout(timeoutMs)
+      socket.once("connect", () => finish(true, null))
+      socket.once("timeout", () => finish(false, "timeout"))
+      socket.once("error", (err) => finish(false, err?.code || "error"))
+    })
+  }
+  await Promise.all(peers.map(async (peer) => {
+    const tunnel = peer.tunnel || {}
+    if (!tunnel.host || !tunnel.port) return
+    tunnel.probe = await tcpProbe(tunnel.host, Number(tunnel.port), 3000)
+    if (!tunnel.probe.up) {
+      const retry = await tcpProbe(tunnel.host, Number(tunnel.port), 3000)
+      if (retry.up) tunnel.probe = retry
+    }
+  }))
+
+
   return {
     ok: true,
     generatedAt,

package/lib/delegations.js

@@ -26,53 +26,76 @@ function readJson(file, fallback = null) {
   }
 }
 
-/** 委托列表（本地台账，按更新时间倒序）。 */
+/** 委托列表（本地台账，按更新时间倒序）。
+ *  - 过滤 selftest 污染记录（selftest 曾把测试任务写进真实台账）
+ *  - 活跃任务超过阈值未更新 → displayState=stalled（UI 不再显示无限 loading）
+ */
 export function listDelegations(limit = 50) {
   const data = readJson(join(meshHome(), 'delegations.json'), { tasks: {} })
   const localNode = readJson(join(meshHome(), 'config.json'), {})?.node?.name || ''
-  const tasks = Object.values(data?.tasks || {}).map((task) => {
-    const start = Date.parse(task.createdAt || '')
-    const end = Date.parse(task.updatedAt || '') || Date.now()
-    const from = task.from || ''
-    return {
-      taskId: task.taskId || '',
-      conversationId: task.conversationId || '',
-      sessionId: task.sessionId || '',
-      from,
-      fromLabel: nodeLabel(from),
-      fromIsLocal: Boolean(from) && from === localNode,
-      fromInstance: task.fromInstance || '',
-      node: task.node || '',
-      nodeLabel: nodeLabel(task.node),
-      toIsLocal: Boolean(task.node) && task.node === localNode,
-      instance: task.instance || '',
-      workspace: task.workspace || '',
-      dedicated: Boolean(task.dedicated),
-      state: task.state || 'unknown',
-      startedAt: task.startedAt || '',
-      finishedAt: task.finishedAt || '',
-      isActive: ['working', 'submitted', 'accepted', 'question', 'provisioning', 'running'].indexOf(task.state || '') >= 0,
-      activeFresh: ['working', 'submitted', 'accepted', 'question', 'provisioning', 'running'].indexOf(task.state || '') >= 0 && (Date.now() - Date.parse(task.updatedAt || 0) < 12 * 3600 * 1000),
-      displayAt: task.finishedAt || task.updatedAt || '',
-      policy: task.requestedPolicy || task.policy || '',
-      goal: String(task.goal || ''),
-      createdAt: task.createdAt || '',
-      updatedAt: task.updatedAt || '',
-      durationSec: (() => {
-        if (!Number.isFinite(start)) return null
-        const value = Math.max(0, Math.round((end - start) / 1000))
-        return value > 12 * 3600 ? null : value // 台账 updatedAt 会被轮询刷新，超长值不可信
-      })(),
-      stalledReason: task.stalledReason || '',
-      lastSummary: task.summary || ''
-    }
-  })
+  const ACTIVE_STATES = ['working', 'submitted', 'accepted', 'question', 'provisioning', 'running']
+  // 超过这些时间没有 updatedAt 更新，就认为“疑似失联”（不直接改文件，UI 只展示）
+  const STALE_AFTER_MS = {
+    submitted: 15 * 60 * 1000,
+    accepted: 15 * 60 * 1000,
+    provisioning: 15 * 60 * 1000,
+    working: 60 * 60 * 1000,
+    running: 60 * 60 * 1000,
+    question: 6 * 60 * 60 * 1000
+  }
+  const nowMs = Date.now()
+  const tasks = Object.values(data?.tasks || {})
+    .filter((task) => task && task.from !== 'selftest')
+    .map((task) => {
+      const start = Date.parse(task.createdAt || '')
+      const end = Date.parse(task.updatedAt || '') || nowMs
+      const from = task.from || ''
+      const state = task.state || 'unknown'
+      const isActive = ACTIVE_STATES.indexOf(state) >= 0
+      const updatedMs = Date.parse(task.updatedAt || task.createdAt || '')
+      const ageMs = Number.isFinite(updatedMs) ? nowMs - updatedMs : Infinity
+      const staleAfter = STALE_AFTER_MS[state] ?? 60 * 60 * 1000
+      const staleActive = isActive && ageMs > staleAfter
+      return {
+        taskId: task.taskId || '',
+        conversationId: task.conversationId || '',
+        sessionId: task.sessionId || '',
+        from,
+        fromLabel: nodeLabel(from),
+        fromIsLocal: Boolean(from) && from === localNode,
+        fromInstance: task.fromInstance || '',
+        node: task.node || '',
+        nodeLabel: nodeLabel(task.node),
+        toIsLocal: Boolean(task.node) && task.node === localNode,
+        instance: task.instance || '',
+        workspace: task.workspace || '',
+        dedicated: Boolean(task.dedicated),
+        state,
+        displayState: staleActive ? 'stalled' : state,
+        isActive,
+        staleActive,
+        staleAfterSec: Math.round(staleAfter / 1000),
+        activeFresh: isActive && !staleActive,
+        displayAt: task.finishedAt || task.updatedAt || '',
+        policy: task.requestedPolicy || task.policy || '',
+        goal: String(task.goal || ''),
+        createdAt: task.createdAt || '',
+        updatedAt: task.updatedAt || '',
+        durationSec: (() => {
+          if (!Number.isFinite(start)) return null
+          const value = Math.max(0, Math.round((end - start) / 1000))
+          return value > 12 * 3600 ? null : value // 台账 updatedAt 会被轮询刷新，超长值不可信
+        })(),
+        stalledReason: task.stalledReason || '',
+        lastSummary: task.summary || ''
+      }
+    })
   tasks.sort((a, b) => {
     if (a.activeFresh !== b.activeFresh) return a.activeFresh ? -1 : 1
     return String(b.displayAt || b.updatedAt || '').localeCompare(String(a.displayAt || a.updatedAt || ''))
   })
   const byState = {}
-  for (const task of tasks) byState[task.state] = (byState[task.state] || 0) + 1
+  for (const task of tasks) byState[task.displayState] = (byState[task.displayState] || 0) + 1
   return { total: tasks.length, byState, localNode, tasks: tasks.slice(0, Math.max(1, Math.min(limit, 200))) }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-mesh-ui",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "DSH settings-page panel for dsh-mesh: AI network topology, peer health, and delegation panel. Read-only; data is collected from the local mesh CLI.",
   "icon": "icon.svg",
   "type": "module",