@twinsearth/dsh-2xray 0.2.0 → 0.2.2

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## 0.2.2 — 2026-10-29
+
+### 新增
+
+- **界面三段式重做**：左侧「2Xray」面板改为「当前 VPN 配置 / 实时连接日志 / 状态栏（延迟 · VPN 名称 · 出口 IP）」。
+- **设置页卡片**：客户端注册 `plugins.item` 卡片（分享链接、启用、takeover、xray 路径、端口），解决 DSH 不会自动渲染表单的问题；侧边栏面板与设置卡片共用同一配置。
+- **Host 状态通道**：`/api/xray/status`（经 `ctx.connection.fetch` 鉴权围栏）返回快照 + 日志环 + 延迟/出口 IP；日志 1000 条环缓冲、按 cursor 增量拉取。
+- **延迟/出口探测**：经本地入站 absolute-form 请求，仅接管后运行，30s/10min TTL，单飞。
+
+### 修复
+
+- 功能探测失败不再杀进程：改为 `degraded(probe-failed)`，健康循环重试并自动接管。
+- 默认探测目标从 gstatic 改为 `cp.cloudflare.com/generate_204`，避免大陆网络误判。
+- `xray_status` 增加 `settingsSchema`，可远程确认宿主是否加载了设置表单 schema。
+
+## 0.2.1 — 2026-10-29
+
+### 修复
+
+- **设置页仍不显示**：Schemastery 改为优先通过 `createRequire(import.meta.url)` / profile 锚点解析文件后动态 import，绕开宿主模块加载器对裸 specifier 的受限解析；加载结果写入 `xray_status.settingsSchema`，可远程确认表单是否具备渲染条件。
+- **侧边栏入口优先注册**：先注册 `sidebar.panellist`，再注册主面板；主面板失败不再连带隐藏入口。
+
 ## 0.2.0 — 2026-10-29
 
 ### 新增

package/index.js

@@ -6,6 +6,8 @@ import { createLogger } from './lib/log.js'
 import { resolveDataDir } from './lib/paths.js'
 import { ControlClient } from './lib/control/client.js'
 import { installTools } from './lib/tools.js'
+import { LogBuffer } from './lib/logbuf.js'
+import { Monitor } from './lib/monitor.js'
 
 export const name = 'dsh-2xray'
 
@@ -36,7 +38,23 @@ export { Config }
  * disposer returned from `apply` are the lifecycle seam.
  */
 export function apply(ctx, rawConfig) {
-  const logger = createLogger(ctx)
+  const ring = new LogBuffer(1000)
+  const baseLogger = createLogger(ctx)
+  const logger = {
+    info: (...args) => {
+      ring.append('info', args.join(' '))
+      baseLogger.info(...args)
+    },
+    warn: (...args) => {
+      ring.append('warn', args.join(' '))
+      baseLogger.warn(...args)
+    },
+    error: (...args) => {
+      ring.append('error', args.join(' '))
+      baseLogger.error(...args)
+    },
+    debug: (...args) => baseLogger.debug(...args),
+  }
   const { config, errors, warnings } = normalizeConfig(rawConfig)
 
   for (const warning of warnings) logger.warn(`配置警告：${warning}`)
@@ -90,10 +108,62 @@ export function apply(ctx, rawConfig) {
     launcher,
     route,
     control,
+    schemaLoaded: Boolean(Config),
     logger,
     dataDir,
   })
 
+  const monitor = new Monitor({
+    host: config.inbound.host,
+    port: config.inbound.port,
+    latencyUrl: config.functionalProbe.url,
+    logger,
+  })
+
+  // Authenticated status/log feed for the browser panel. Optional service: a
+  // profile without `connection` keeps the proxy and the tools, it only loses
+  // the live panel data.
+  if (typeof ctx.inject === 'function') {
+    ctx.inject(['connection'], (child) => {
+      try {
+        child.effect(
+          () =>
+            child.connection.fetch.register({
+              path: '/api/xray/status',
+              methods: ['GET'],
+              requestBody: 'buffered',
+              fetch: (request) => {
+                const url = new URL(request.url)
+                const after = Number(url.searchParams.get('after') ?? 0) || 0
+                const snapshot = supervisor.snapshot()
+                const proxied = snapshot.state === 'ready' && snapshot.route?.installed === true
+                monitor.maybeRefresh({ ready: proxied })
+                const node = snapshot.nodes?.find((entry) => entry.tag === snapshot.activeNode)
+                const page = ring.since(after)
+                const body = JSON.stringify({
+                  ok: true,
+                  status: {
+                    ...snapshot,
+                    proxied,
+                    vpnName: node?.id ?? snapshot.activeNode ?? null,
+                    probe: monitor.snapshot(),
+                  },
+                  logs: page.items,
+                  cursor: page.cursor,
+                })
+                return new Response(body, {
+                  headers: { 'content-type': 'application/json; charset=utf-8', 'cache-control': 'no-store' },
+                })
+              },
+            }),
+          'dsh-2xray: status api',
+        )
+      } catch (error) {
+        logger.warn(`状态 API 注册失败：${String(error)}`)
+      }
+    })
+  }
+
   const dispose = ctx.effect(
     () => async () => {
       await supervisor.stop()

package/lib/client.js

@@ -5,14 +5,40 @@ window.__ModuleLoader__.load({
     const h = React.createElement
 
     const PANEL_ID = 'xray'
+    const NS = 'xray-proxy'
     const inject = ['slots', 'locale']
 
-    function GlobeIcon() {
+    const C = {
+      page: { maxWidth: 980, margin: '0 auto', padding: '20px 24px 16px', color: 'var(--dsw-alias-label-primary, #0f1115)' },
+      header: { display: 'flex', alignItems: 'center', gap: 10, marginBottom: 14 },
+      globe: { display: 'inline-flex', alignItems: 'center', justifyContent: 'center' },
+      title: { fontSize: 18, fontWeight: 600, margin: 0 },
+      sub: { fontSize: 12, color: 'var(--dsw-alias-label-secondary, #61666b)', margin: '2px 0 0' },
+      pill: { marginLeft: 'auto', display: 'inline-flex', alignItems: 'center', gap: 6, fontSize: 12, fontWeight: 500, padding: '4px 10px', borderRadius: 999, border: '1px solid var(--dsw-alias-border-l2, rgba(0,0,0,.12))' },
+      dot: { width: 8, height: 8, borderRadius: 999, background: '#9ca3af' },
+      card: { border: '1px solid var(--dsw-alias-border-l2, rgba(0,0,0,.12))', borderRadius: 12, padding: 12, marginBottom: 12, background: 'var(--dsw-alias-bg-layer-1, transparent)' },
+      cardHead: { display: 'flex', alignItems: 'center', gap: 8, marginBottom: 8, fontSize: 13, fontWeight: 600 },
+      table: { width: '100%', borderCollapse: 'collapse', fontSize: 12.5 },
+      th: { textAlign: 'left', fontWeight: 500, color: 'var(--dsw-alias-label-secondary, #61666b)', padding: '6px 8px', borderBottom: '1px solid var(--dsw-alias-border-l2, rgba(0,0,0,.12))' },
+      td: { padding: '7px 8px', borderBottom: '1px solid var(--dsw-alias-border-l1, rgba(0,0,0,.06))', verticalAlign: 'middle' },
+      mono: { fontFamily: 'ui-monospace, Consolas, monospace' },
+      logBox: { height: 220, overflow: 'auto', border: '1px solid var(--dsw-alias-border-l2, rgba(0,0,0,.12))', borderRadius: 8, padding: '6px 8px', background: 'var(--dsw-alias-markdown-code-block, #f9fafb)' },
+      logLine: { display: 'flex', gap: 8, fontSize: 11.5, lineHeight: '18px', fontFamily: 'ui-monospace, Consolas, monospace' },
+      statusBar: { display: 'flex', alignItems: 'center', gap: 14, flexWrap: 'wrap', border: '1px solid var(--dsw-alias-border-l2, rgba(0,0,0,.12))', borderRadius: 12, padding: '10px 14px', fontSize: 12.5 },
+      btn: { padding: '5px 10px', borderRadius: 7, border: '1px solid var(--dsw-alias-border-l2, rgba(0,0,0,.16))', background: 'transparent', color: 'inherit', cursor: 'pointer', fontSize: 12 },
+      primaryBtn: { padding: '6px 12px', borderRadius: 7, border: '1px solid #2563eb', background: '#2563eb', color: '#fff', cursor: 'pointer', fontSize: 12.5 },
+      input: { width: '100%', boxSizing: 'border-box', padding: '7px 9px', borderRadius: 7, border: '1px solid var(--dsw-alias-border-l2, rgba(0,0,0,.16))', background: 'transparent', color: 'inherit', fontSize: 12.5 },
+      label: { display: 'block', fontSize: 12, color: 'var(--dsw-alias-label-secondary, #61666b)', margin: '8px 0 4px' },
+      muted: { color: 'var(--dsw-alias-label-secondary, #61666b)' },
+      error: { color: '#c81e1e' },
+    }
+
+    function GlobeIcon({ size = 20 } = {}) {
       return h(
         'svg',
         {
-          width: 20,
-          height: 20,
+          width: size,
+          height: size,
           viewBox: '0 0 24 24',
           fill: 'none',
           stroke: 'currentColor',
@@ -27,241 +53,268 @@ window.__ModuleLoader__.load({
       )
     }
 
-    const styles = {
-      page: { maxWidth: 760, margin: '0 auto', padding: '28px 20px 48px', color: 'var(--dsh-text, #e2e8f0)' },
-      title: { fontSize: 20, fontWeight: 600, margin: '0 0 4px' },
-      hint: { color: 'var(--dsh-text-secondary, #94a3b8)', fontSize: 13, margin: '0 0 20px' },
-      card: { border: '1px solid var(--dsh-border, #334155)', borderRadius: 12, padding: 16, marginBottom: 16 },
-      h2: { fontSize: 15, margin: '0 0 10px' },
-      textarea: {
-        width: '100%',
-        boxSizing: 'border-box',
-        minHeight: 84,
-        padding: 10,
-        borderRadius: 8,
-        border: '1px solid var(--dsh-border, #334155)',
-        background: 'var(--dsh-surface, #0b1220)',
-        color: 'inherit',
-        font: '13px/1.5 ui-monospace, Consolas, monospace',
-        resize: 'vertical',
-      },
-      row: { display: 'flex', gap: 10, flexWrap: 'wrap', alignItems: 'center', marginTop: 10 },
-      button: {
-        padding: '8px 14px',
-        borderRadius: 8,
-        border: '1px solid var(--dsh-border, #334155)',
-        background: 'var(--dsh-surface-raised, #334155)',
-        color: 'inherit',
-        cursor: 'pointer',
-        fontSize: 14,
-      },
-      primary: { background: '#2563eb', borderColor: '#2563eb', color: '#fff' },
-      status: { fontSize: 13, marginTop: 10, minHeight: 20, color: 'var(--dsh-text-secondary, #94a3b8)' },
-      video: { width: '100%', maxHeight: 320, borderRadius: 8, background: '#000', marginTop: 12, display: 'none' },
-      steps: { margin: '10px 0 0', paddingLeft: 20, fontSize: 13, color: 'var(--dsh-text-secondary, #94a3b8)' },
+    function phaseOf(status) {
+      if (!status) return { label: '状态未知', color: '#9ca3af' }
+      if (status.proxied) return { label: '已连接', color: '#15803d' }
+      if (status.state === 'ready') return { label: '已就绪 · 未接管', color: '#b45309' }
+      if (status.state === 'degraded') return { label: '连接降级', color: '#b45309' }
+      if (status.state === 'starting' || status.state === 'resolving' || status.state === 'backoff') return { label: '正在连接', color: '#2f5fbf' }
+      if (status.state === 'failed') return { label: '连接失败', color: '#c81e1e' }
+      if (status.state === 'stopped') return { label: '已停止', color: '#9ca3af' }
+      return { label: '未启用', color: '#9ca3af' }
     }
 
-    function XrayPage() {
-      const [text, setText] = React.useState('')
-      const [status, setStatus] = React.useState('')
-      const [statusKind, setStatusKind] = React.useState('')
-      const [scanning, setScanning] = React.useState(false)
-      const videoRef = React.useRef(null)
-      const streamRef = React.useRef(null)
-      const timerRef = React.useRef(null)
-      const detectorRef = React.useRef(null)
+    function fmtTime(ts) {
+      const d = new Date(ts)
+      return `${String(d.getHours()).padStart(2, '0')}:${String(d.getMinutes()).padStart(2, '0')}:${String(d.getSeconds()).padStart(2, '0')}`
+    }
 
-      const say = (message, kind) => {
-        setStatus(message)
-        setStatusKind(kind || '')
-      }
+    function StatusPill({ status }) {
+      const phase = phaseOf(status)
+      return h('span', { style: C.pill }, h('span', { style: { ...C.dot, background: phase.color } }), phase.label)
+    }
 
-      const detector = () => {
-        if (detectorRef.current !== null) return detectorRef.current
-        detectorRef.current = 'BarcodeDetector' in window ? new window.BarcodeDetector({ formats: ['qr_code'] }) : false
-        return detectorRef.current
-      }
+    function useStatusFeed() {
+      const [status, setStatus] = React.useState(null)
+      const [logs, setLogs] = React.useState([])
+      const [error, setError] = React.useState(null)
+      const cursor = React.useRef(0)
 
-      const decodeCanvas = async (canvas) => {
-        const det = detector()
-        if (!det) return null
-        const codes = await det.detect(canvas)
-        return codes && codes.length > 0 ? codes[0].rawValue : null
-      }
+      React.useEffect(() => {
+        let cancelled = false
+        let timer
+        const tick = async () => {
+          try {
+            const url = new URL(`api/xray/status?after=${cursor.current}`, document.baseURI)
+            const response = await fetch(url, { credentials: 'same-origin', headers: { accept: 'application/json' } })
+            if (!response.ok) throw new Error(`HTTP ${response.status}`)
+            const data = await response.json()
+            if (cancelled) return
+            setStatus(data.status)
+            if (Array.isArray(data.logs) && data.logs.length > 0) {
+              setLogs((previous) => {
+                const merged = previous.concat(data.logs)
+                return merged.length > 500 ? merged.slice(merged.length - 500) : merged
+              })
+            }
+            cursor.current = data.cursor ?? cursor.current
+            setError(null)
+          } catch (cause) {
+            if (!cancelled) setError(cause.message || String(cause))
+          }
+          if (!cancelled) timer = setTimeout(tick, 2000)
+        }
+        tick()
+        return () => {
+          cancelled = true
+          clearTimeout(timer)
+        }
+      }, [])
 
-      const accept = (value) => {
-        const trimmed = String(value || '').trim()
-        if (!trimmed) return false
-        setText(trimmed)
-        say('已识别：' + trimmed.slice(0, 64) + (trimmed.length > 64 ? '…' : ''), 'ok')
-        return true
-      }
+      return { status, logs, error, setLogs }
+    }
 
-      const onFile = async (event) => {
-        const file = event.target.files && event.target.files[0]
-        if (!file) return
-        say('正在解析图片…')
-        try {
-          const bitmap = await createImageBitmap(file)
-          const scale = Math.min(1, 1600 / Math.max(bitmap.width, bitmap.height))
-          const canvas = document.createElement('canvas')
-          canvas.width = Math.max(1, Math.round(bitmap.width * scale))
-          canvas.height = Math.max(1, Math.round(bitmap.height * scale))
-          canvas.getContext('2d').drawImage(bitmap, 0, 0, canvas.width, canvas.height)
-          const value = await decodeCanvas(canvas)
-          if (!value) say('图片里没有识别到二维码；换一张更清晰/更大的图，或使用插件目录里的 tools/scanner.html（带 jsQR 兜底）。', 'error')
-          else accept(value)
-        } catch (error) {
-          say('解析失败：' + error.message, 'error')
-        }
+    function NodeTable({ status }) {
+      const nodes = status?.nodes ?? []
+      if (nodes.length === 0) {
+        return h('div', { style: { ...C.muted, padding: '10px 0', fontSize: 12.5 } }, '还没有节点。到「设置 → 插件 → Xray 代理」粘贴 vless 链接并保存，重启 DSH 后这里会显示。')
       }
+      return h(
+        'table',
+        { style: C.table },
+        h('thead', null, h('tr', null,
+          h('th', { style: C.th }), h('th', { style: C.th }, '节点'), h('th', { style: C.th }, '地址'),
+          h('th', { style: C.th }, '端口'), h('th', { style: C.th }, '状态'))),
+        h('tbody', null, nodes.map((node) => {
+          const active = node.tag === status.activeNode
+          return h('tr', { key: node.tag },
+            h('td', { style: C.td }, active
+              ? h('span', { style: { ...C.dot, background: '#15803d', display: 'inline-block' } })
+              : h('span', { style: { ...C.dot, border: '1px solid currentColor', background: 'transparent', display: 'inline-block' } })),
+            h('td', { style: C.td }, node.id ?? node.tag),
+            h('td', { style: { ...C.td, ...C.mono } }, node.address || '—'),
+            h('td', { style: { ...C.td, ...C.mono } }, node.port ?? '—'),
+            h('td', { style: C.td }, active ? '当前' : '—'))
+        })),
+      )
+    }
 
-      const stop = async () => {
-        if (timerRef.current) {
-          clearInterval(timerRef.current)
-          timerRef.current = null
-        }
-        if (streamRef.current) {
-          for (const track of streamRef.current.getTracks()) track.stop()
-          streamRef.current = null
-        }
-        if (videoRef.current) videoRef.current.srcObject = null
-        setScanning(false)
-      }
+    function LogList({ logs, setLogs }) {
+      const box = React.useRef(null)
+      const [follow, setFollow] = React.useState(true)
+      React.useEffect(() => {
+        if (follow && box.current) box.current.scrollTop = box.current.scrollHeight
+      }, [logs, follow])
+      return h('div', null,
+        h('div', { style: { display: 'flex', gap: 8, marginBottom: 6 } },
+          h('button', { type: 'button', style: C.btn, onClick: () => setFollow((v) => !v) }, follow ? '自动滚动：开' : '自动滚动：关'),
+          h('button', { type: 'button', style: C.btn, onClick: () => setLogs([]) }, '清空视图')),
+        h('div', { ref: box, style: C.logBox },
+          logs.length === 0
+            ? h('div', { style: { ...C.muted, fontSize: 12 } }, '暂无连接日志')
+            : logs.map((line) => h('div', { key: line.seq, style: C.logLine },
+                h('span', { style: { ...C.muted, flex: '0 0 66px' } }, fmtTime(line.ts)),
+                h('span', { style: { flex: '0 0 40px', color: line.level === 'error' ? '#c81e1e' : line.level === 'warn' ? '#b45309' : 'inherit' } }, line.level.toUpperCase()),
+                h('span', { style: { flex: 1, whiteSpace: 'pre-wrap', wordBreak: 'break-word' } }, line.text)))))
+    }
 
-      const tick = async () => {
-        const video = videoRef.current
-        if (!video || !streamRef.current) return
-        if (video.readyState < 2 || !video.videoWidth) return
-        const canvas = document.createElement('canvas')
-        canvas.width = video.videoWidth
-        canvas.height = video.videoHeight
-        canvas.getContext('2d').drawImage(video, 0, 0)
-        try {
-          const value = await decodeCanvas(canvas)
-          if (value) {
-            accept(value)
-            await stop()
-            say('已识别并停止扫描。', 'ok')
-          }
-        } catch {
-          // a failed frame is normal while the code is out of view
-        }
+    function XrayPage() {
+      const { status, logs, error, setLogs } = useStatusFeed()
+      const phase = phaseOf(status)
+      const probe = status?.probe ?? {}
+      const latency = probe.latency?.ms
+      const egress = probe.egress ?? {}
+      const localEndpoint = status ? `127.0.0.1:${status.port}` : '—'
+
+      return h('div', { style: C.page },
+        h('div', { style: C.header },
+          h('span', { style: C.globe }, h(GlobeIcon, { size: 22 })),
+          h('div', null,
+            h('h1', { style: C.title }, '2Xray'),
+            h('p', { style: C.sub }, `Xray 全局代理 · 本地 ${localEndpoint}`)),
+          h(StatusPill, { status })),
+        error
+          ? h('div', { style: { ...C.card, ...C.error, fontSize: 12.5 } }, `状态通道不可用：${error}（代理本身可能仍在工作）`)
+          : null,
+        status?.reason && status.state !== 'ready'
+          ? h('div', { style: { ...C.card, fontSize: 12.5 } }, h('b', null, '原因：'), ` ${status.reason}`,
+              status.detail ? h('div', { style: { ...C.muted, marginTop: 4 } }, status.detail) : null)
+          : null,
+        h('section', { style: C.card },
+          h('div', { style: C.cardHead }, '当前 VPN 配置',
+            h('span', { style: { ...C.muted, fontWeight: 400, marginLeft: 'auto' } }, `${status?.nodes?.length ?? 0} 个节点`)),
+          h(NodeTable, { status })),
+        h('section', { style: C.card },
+          h('div', { style: C.cardHead }, '实时连接日志'),
+          h(LogList, { logs, setLogs })),
+        h('div', { style: C.statusBar },
+          h('span', { style: { ...C.dot, background: phase.color } }),
+          h('b', null, phase.label),
+          h('span', { style: { ...C.mono, fontWeight: 600 } }, latency == null ? '延迟 —' : `延迟 ${latency} ms`),
+          h('span', { style: { ...C.mono } }, status?.vpnName ? String(status.vpnName) : '—'),
+          h('span', { style: { ...C.mono } }, egress?.ip ? `出口 ${egress.ip}${egress.country ? ` (${egress.country})` : ''}` : '出口 IP —'),
+          h('span', { style: { ...C.muted, marginLeft: 'auto' } }, status?.updatedAt ? `更新于 ${fmtTime(status.updatedAt)}` : '等待状态')))
+    }
+
+    function Field({ label, children }) {
+      return h('div', null, h('label', { style: C.label }, label), children)
+    }
+
+    function readFormValue(form) {
+      try {
+        const snapshot = form?.getSnapshot?.()
+        const candidate = snapshot?.value ?? snapshot?.state?.view?.value ?? snapshot?.view?.value
+        return candidate && typeof candidate === 'object' ? candidate : {}
+      } catch {
+        return {}
       }
+    }
 
-      const startScreen = async () => {
-        if (!navigator.mediaDevices || !navigator.mediaDevices.getDisplayMedia) {
-          say('当前浏览器不支持屏幕捕获；请改用「二维码图片」或 tools/scanner.html。', 'error')
-          return
-        }
-        if (!detector()) {
-          say('当前浏览器没有 BarcodeDetector；请使用插件目录里的 tools/scanner.html（内置 jsQR 兜底）。', 'error')
-          return
-        }
-        try {
-          const stream = await navigator.mediaDevices.getDisplayMedia({ video: { frameRate: 10 }, audio: false })
-          streamRef.current = stream
-          setScanning(true)
-          if (videoRef.current) {
-            videoRef.current.srcObject = stream
-            videoRef.current.style.display = 'block'
-            await videoRef.current.play()
-          }
-          stream.getVideoTracks()[0].addEventListener('ended', stop)
-          say('请把二维码放到共享屏幕上，正在识别…')
-          timerRef.current = setInterval(tick, 350)
-        } catch (error) {
-          say('屏幕共享未开始：' + error.message, 'error')
-          setScanning(false)
-        }
+    async function setField(form, field, value) {
+      if (typeof form?.set === 'function' && typeof field === 'string') return form.set(field, value)
+      const snapshot = form?.getSnapshot?.()
+      const revision = snapshot?.revision ?? snapshot?.state?.view?.revision
+      if (typeof form?.mutate === 'function') {
+        return form.mutate([{ op: 'set', path: Array.isArray(field) ? field : [field], value }], revision)
       }
+      throw new Error('设置表单不可写')
+    }
 
-      React.useEffect(() => () => {
-        if (timerRef.current) clearInterval(timerRef.current)
-        if (streamRef.current) for (const track of streamRef.current.getTracks()) track.stop()
-      }, [])
+    function XraySettingsCard({ form }) {
+      const value = readFormValue(form)
+      const [shareLink, setShareLink] = React.useState(value.shareLink ?? '')
+      const [binaryPath, setBinaryPath] = React.useState(value.binary?.path ?? '')
+      const [port, setPort] = React.useState(String(value.inbound?.port ?? 20808))
+      const [enabled, setEnabled] = React.useState(value.enabled === true)
+      const [takeover, setTakeover] = React.useState(value.takeover ?? 'auto')
+      const [message, setMessage] = React.useState('')
+      const [busy, setBusy] = React.useState(false)
 
-      const copy = async () => {
-        if (!text.trim()) {
-          say('还没有链接可复制。', 'error')
-          return
-        }
+      const save = async () => {
+        setBusy(true)
         try {
-          await navigator.clipboard.writeText(text.trim())
-          say('已复制。粘贴到「插件 → Xray 代理 → 分享链接」后保存，并重启 DSH。', 'ok')
-        } catch {
-          say('复制失败，请手动选中文本复制。', 'error')
+          await setField(form, 'shareLink', shareLink.trim())
+          await setField(form, 'enabled', enabled)
+          await setField(form, 'takeover', takeover)
+          const numericPort = Number(port)
+          if (Number.isInteger(numericPort) && numericPort > 0) await setField(form, ['inbound', 'port'], numericPort)
+          if (binaryPath.trim()) await setField(form, ['binary', 'path'], binaryPath.trim())
+          setMessage('已保存，重启 DSH 后生效。')
+        } catch (error) {
+          setMessage('保存失败：' + (error.message || error))
+        } finally {
+          setBusy(false)
         }
       }
 
-      return h(
-        'div',
-        { style: styles.page },
-        h('h1', { style: styles.title }, '2Xray'),
-        h('p', { style: styles.hint }, '扫描或粘贴 vless 分享链接，然后到「插件 → Xray 代理」里保存。'),
-        h(
-          'section',
-          { style: styles.card },
-          h('h2', { style: styles.h2 }, '1. 二维码图片'),
-          h('input', { type: 'file', accept: 'image/*', onChange: onFile, disabled: scanning }),
-          h('div', { style: styles.status, 'aria-live': 'polite' }, status),
-        ),
-        h(
-          'section',
-          { style: styles.card },
-          h('h2', { style: styles.h2 }, '2. 扫描屏幕二维码'),
-          h(
-            'div',
-            { style: styles.row },
-            h('button', { type: 'button', style: { ...styles.button, ...styles.primary }, onClick: startScreen, disabled: scanning }, scanning ? '扫描中…' : '开始扫描屏幕'),
-            h('button', { type: 'button', style: styles.button, onClick: stop, disabled: !scanning }, '停止'),
-          ),
-          h('video', { ref: videoRef, playsInline: true, muted: true, style: styles.video }),
-        ),
-        h(
-          'section',
-          { style: styles.card },
-          h('h2', { style: styles.h2 }, '3. 分享链接'),
+      return h('div', { style: { ...C.card, marginTop: 8 } },
+        h('div', { style: C.cardHead }, h(GlobeIcon), '2Xray 连接'),
+        h(Field, { label: 'VLESS 分享链接（粘贴或扫码）' },
           h('textarea', {
-            style: styles.textarea,
-            value: text,
+            style: { ...C.input, minHeight: 64, fontFamily: 'ui-monospace, Consolas, monospace' },
+            value: shareLink,
             placeholder: 'vless://uuid@host:443?security=reality&sni=...&pbk=...#备注',
-            onChange: (event) => setText(event.target.value),
-          }),
-          h(
-            'div',
-            { style: styles.row },
-            h('button', { type: 'button', style: { ...styles.button, ...styles.primary }, onClick: copy }, '复制链接'),
-            h('span', { style: { ...styles.status, marginTop: 0, color: statusKind === 'error' ? '#f87171' : statusKind === 'ok' ? '#4ade80' : undefined } }, status),
-          ),
-          h(
-            'ol',
-            { style: styles.steps },
-            h('li', null, '复制上面的 vless:// 链接；'),
-            h('li', null, '打开 设置 → 插件 → Xray 代理，粘贴到「分享链接」并保存；'),
-            h('li', null, '重启 DSH，状态变为 ready 后即生效。'),
-          ),
-        ),
-      )
+            onChange: (event) => setShareLink(event.target.value),
+          })),
+        h('div', { style: { display: 'flex', gap: 12, flexWrap: 'wrap' } },
+          h('label', { style: { fontSize: 12.5, display: 'flex', alignItems: 'center', gap: 6, marginTop: 8 } },
+            h('input', { type: 'checkbox', checked: enabled, onChange: (event) => setEnabled(event.target.checked) }), '启用代理'),
+          h('label', { style: { fontSize: 12.5, display: 'flex', alignItems: 'center', gap: 6, marginTop: 8 } }, 'takeover',
+            h('select', { value: takeover, onChange: (event) => setTakeover(event.target.value), style: { padding: '4px 8px', borderRadius: 6, background: 'transparent', color: 'inherit' } },
+              h('option', { value: 'auto' }, 'auto'), h('option', { value: 'force' }, 'force'), h('option', { value: 'off' }, 'off')))),
+        h(Field, { label: 'xray 可执行文件路径（留空自动查找）' },
+          h('input', { style: { ...C.input, fontFamily: 'ui-monospace, Consolas, monospace' }, value: binaryPath, placeholder: '例如 D:\\v2rayN\\xray.exe', onChange: (event) => setBinaryPath(event.target.value) })),
+        h(Field, { label: '本地 HTTP 入站端口' },
+          h('input', { style: C.input, value: port, onChange: (event) => setPort(event.target.value) })),
+        h('div', { style: { display: 'flex', gap: 10, alignItems: 'center', marginTop: 12 } },
+          h('button', { type: 'button', style: C.primaryBtn, disabled: busy, onClick: save }, busy ? '保存中…' : '保存'),
+          h('span', { style: { ...C.muted, fontSize: 12 } }, message)),
+        h('p', { style: { ...C.muted, fontSize: 12, marginTop: 10 } }, '打开左侧「2Xray」面板可扫码导入、查看节点/日志/延迟/出口 IP。'))
     }
 
     function apply(ctx) {
       ctx.effect(
         () =>
-          ctx.slots.inject('main', () =>
-            ctx.slots.register({ name: 'main', key: PANEL_ID }, XrayPage),
+          ctx.slots.inject('sidebar.panellist', () =>
+            ctx.slots.register({ name: 'sidebar.panellist', id: PANEL_ID, order: 1, label: () => '2Xray' }, GlobeIcon),
           ),
-        'dsh-2xray: main panel',
+        'dsh-2xray: sidebar entry',
       )
       ctx.effect(
         () =>
-          ctx.slots.inject('sidebar.panellist', () =>
-            ctx.slots.register({ name: 'sidebar.panellist', id: PANEL_ID, order: 1, label: () => '2Xray' }, GlobeIcon),
+          ctx.slots.inject('main', () =>
+            ctx.slots.register({ name: 'main', key: PANEL_ID }, XrayPage),
           ),
-        'dsh-2xray: sidebar entry',
+        'dsh-2xray: main panel',
       )
+      if (typeof ctx.inject === 'function') {
+        ctx.inject(['configForms'], (child) => {
+          try {
+            child.effect(
+              () =>
+                child.configForms.whileServed([NS], () =>
+                  child.slots.inject('plugins.item', () =>
+                    child.slots.register(
+                      {
+                        name: 'plugins.item',
+                        id: PANEL_ID,
+                        order: 40,
+                        label: () => '2Xray 连接',
+                        inject: () => ({ form: child.configForms.get(NS) }),
+                      },
+                      XraySettingsCard,
+                    ),
+                  ),
+                ),
+              'dsh-2xray: settings card',
+            )
+          } catch {
+            // a client without the settings service keeps the sidebar panel
+          }
+        })
+      }
     }
 
-    return { apply, inject, PANEL_ID }
+    return { apply, inject, PANEL_ID, NS }
   },
 })

package/lib/config.js

@@ -79,8 +79,10 @@ export const DEFAULT_CONFIG = {
   },
   functionalProbe: {
     enabled: true,
-    url: 'http://www.gstatic.com/generate_204',
-    timeoutMs: 5000,
+    // Reachable from mainland networks through most nodes; gstatic is often
+    // blocked and would misreport a working tunnel as failed.
+    url: 'http://cp.cloudflare.com/generate_204',
+    timeoutMs: 8000,
   },
   log: { level: 'warning' },
 }

package/lib/logbuf.js

@@ -0,0 +1,27 @@
+/** Bounded in-memory log ring served to the panel over the authenticated API. */
+export class LogBuffer {
+  #items = []
+  #capacity
+  #seq = 0
+
+  constructor(capacity = 1000) {
+    this.#capacity = capacity
+  }
+
+  append(level, text) {
+    const entry = {
+      seq: ++this.#seq,
+      ts: Date.now(),
+      level: ['debug', 'info', 'warn', 'error'].includes(level) ? level : 'info',
+      text: String(text ?? '').slice(0, 2000),
+    }
+    this.#items.push(entry)
+    if (this.#items.length > this.#capacity) this.#items.splice(0, this.#items.length - this.#capacity)
+    return entry
+  }
+
+  since(after = 0, limit = 200) {
+    const items = this.#items.filter((entry) => entry.seq > after).slice(0, limit)
+    return { items, cursor: this.#seq, dropped: this.#seq - this.#capacity > after }
+  }
+}

package/lib/monitor.js

@@ -0,0 +1,150 @@
+import http from 'node:http'
+
+/**
+ * Latency and egress-IP probes. Both go through the local HTTP inbound with an
+ * absolute-form request line, so they exercise the tunnel instead of the
+ * direct network. Plain http only: no CONNECT/TLS work is needed here.
+ */
+export class Monitor {
+  #host
+  #port
+  #latencyUrl
+  #egressUrl
+  #latencyTimeoutMs
+  #egressTimeoutMs
+  #latencyTtlMs
+  #egressTtlMs
+  #logger
+  #state = {
+    latency: { ms: null, at: null, state: 'idle' },
+    egress: { ip: null, country: null, at: null, state: 'idle' },
+  }
+  #latencyFlight = null
+  #egressFlight = null
+
+  constructor({
+    host = '127.0.0.1',
+    port = 20808,
+    latencyUrl = 'http://cp.cloudflare.com/generate_204',
+    egressUrl = 'http://ip-api.com/json/?fields=status,country,countryCode,query',
+    latencyTimeoutMs = 4000,
+    egressTimeoutMs = 5000,
+    latencyTtlMs = 30_000,
+    egressTtlMs = 600_000,
+    logger,
+  } = {}) {
+    this.#host = host
+    this.#port = port
+    this.#latencyUrl = latencyUrl
+    this.#egressUrl = egressUrl
+    this.#latencyTimeoutMs = latencyTimeoutMs
+    this.#egressTimeoutMs = egressTimeoutMs
+    this.#latencyTtlMs = latencyTtlMs
+    this.#egressTtlMs = egressTtlMs
+    this.#logger = logger
+  }
+
+  snapshot() {
+    const now = Date.now()
+    const latencyFresh = this.#state.latency.at !== null && now - this.#state.latency.at < this.#latencyTtlMs
+    const egressFresh = this.#state.egress.at !== null && now - this.#state.egress.at < this.#egressTtlMs
+    return {
+      latency: { ...this.#state.latency, stale: !latencyFresh },
+      egress: { ...this.#state.egress, stale: !egressFresh },
+    }
+  }
+
+  /** Kick a refresh when data is stale; never throws, never blocks the caller. */
+  maybeRefresh({ ready }) {
+    if (!ready) {
+      this.#state.latency = { ...this.#state.latency, state: 'skipped' }
+      this.#state.egress = { ...this.#state.egress, state: 'skipped' }
+      return
+    }
+    const now = Date.now()
+    if (this.#state.latency.at === null || now - this.#state.latency.at >= this.#latencyTtlMs) {
+      if (this.#latencyFlight === null) {
+        this.#latencyFlight = this.#probeLatency()
+          .catch(() => {})
+          .finally(() => {
+            this.#latencyFlight = null
+          })
+      }
+    }
+    if (this.#state.egress.at === null || now - this.#state.egress.at >= this.#egressTtlMs) {
+      if (this.#egressFlight === null) {
+        this.#egressFlight = this.#probeEgress()
+          .catch(() => {})
+          .finally(() => {
+            this.#egressFlight = null
+          })
+      }
+    }
+  }
+
+  async #probeLatency() {
+    const started = Date.now()
+    const result = await this.#getThroughProxy(this.#latencyUrl, this.#latencyTimeoutMs)
+    const ms = Date.now() - started
+    if (result.status >= 200 && result.status < 400) {
+      this.#state.latency = { ms, at: Date.now(), state: 'ok' }
+      this.#logger?.info?.(`延迟探测：${ms}ms（${this.#latencyUrl}）`)
+    } else {
+      this.#state.latency = { ms: null, at: Date.now(), state: 'error' }
+      this.#logger?.warn?.(`延迟探测失败：${result.error ?? result.status}`)
+    }
+  }
+
+  async #probeEgress() {
+    const result = await this.#getThroughProxy(this.#egressUrl, this.#egressTimeoutMs)
+    if (result.status >= 200 && result.status < 300) {
+      try {
+        const data = JSON.parse(result.body)
+        if (data && data.query) {
+          this.#state.egress = { ip: data.query, country: data.countryCode ?? data.country ?? null, at: Date.now(), state: 'ok' }
+          this.#logger?.info?.(`出口 IP：${data.query}${data.countryCode ? ` (${data.countryCode})` : ''}`)
+          return
+        }
+      } catch {
+        // fall through to error state
+      }
+    }
+    this.#state.egress = { ip: null, country: null, at: Date.now(), state: 'error' }
+    this.#logger?.warn?.(`出口 IP 探测失败：${result.error ?? result.status}`)
+  }
+
+  #getThroughProxy(url, timeoutMs) {
+    return new Promise((resolve) => {
+      let target
+      try {
+        target = new URL(url)
+      } catch (error) {
+        resolve({ status: 0, body: '', error: String(error) })
+        return
+      }
+      const request = http.request(
+        {
+          host: this.#host,
+          port: this.#port,
+          method: 'GET',
+          path: target.href,
+          headers: { host: target.host, connection: 'close' },
+          timeout: timeoutMs,
+        },
+        (response) => {
+          const chunks = []
+          response.on('data', (chunk) => chunks.push(chunk))
+          response.on('end', () =>
+            resolve({ status: response.statusCode ?? 0, body: Buffer.concat(chunks).toString('utf8') }),
+          )
+        },
+      )
+      request.on('timeout', () => {
+        request.destroy(new Error('timeout'))
+        resolve({ status: 0, body: '', error: 'timeout' })
+      })
+      request.on('error', (error) => resolve({ status: 0, body: '', error: error.code ?? error.message }))
+      request.end()
+    })
+  }
+}

package/lib/schema.js

@@ -19,11 +19,6 @@ import { join } from 'node:path'
 import { pathToFileURL } from 'node:url'
 
 async function loadSchema() {
-  try {
-    return (await import('@deepseek-ai/schemastery')).default
-  } catch {
-    // local checkout / test: borrow the profile's copy
-  }
   const home = process.env.USERPROFILE ?? process.env.HOME
   const anchors = home
     ? [
@@ -31,13 +26,29 @@ async function loadSchema() {
         join(home, '.dsh', 'profiles', 'web', 'package.json'),
       ]
     : []
-  for (const anchor of anchors) {
-    try {
+
+  // Prefer Node's own resolver: a bare `import()` inside a plugin may be served
+  // by the harness module loader, whose table does not necessarily contain a
+  // peer package such as Schemastery even though it sits in node_modules.
+  const attempts = [
+    () => {
+      const file = createRequire(import.meta.url).resolve('@deepseek-ai/schemastery')
+      return import(pathToFileURL(file).href)
+    },
+    ...anchors.map((anchor) => () => {
       const file = createRequire(anchor).resolve('@deepseek-ai/schemastery')
-      const module = await import(pathToFileURL(file).href)
-      return module.default ?? module
+      return import(pathToFileURL(file).href)
+    }),
+    () => import('@deepseek-ai/schemastery'),
+  ]
+
+  for (const attempt of attempts) {
+    try {
+      const module = await attempt()
+      const candidate = module?.default ?? module
+      if (typeof candidate === 'function' && typeof candidate.object === 'function') return candidate
     } catch {
-      // try the next profile
+      // try the next resolution route
     }
   }
   throw new Error('@deepseek-ai/schemastery is not resolvable')

package/lib/supervisor.js

@@ -86,6 +86,7 @@ export class Supervisor {
   #resolveBinaryFn
   #control
   #activeNode
+  #schemaLoaded = false
   #now
 
   constructor({
@@ -100,6 +101,7 @@ export class Supervisor {
     probes = {},
     resolveBinaryFn = resolveBinary,
     control,
+    schemaLoaded = false,
     now = () => Date.now(),
   }) {
     this.config = config
@@ -108,6 +110,7 @@ export class Supervisor {
     this.#launcher = launcher
     this.#route = route
     this.#control = control
+    this.#schemaLoaded = schemaLoaded
     this.#activeNode = config.activeNode
     this.#logger = logger
     this.dataDir = dataDir
@@ -317,14 +320,16 @@ export class Supervisor {
       this.#functionalProbe = probe.ok ? 'pass' : `fail:${probe.status ?? probe.error ?? 'unknown'}`
       if (!probe.ok) {
         this.#lastStdio = safeTail(handle) || this.#lastStdio
-        await this.#killHandle(handle)
+        // Keep the process: a node whose egress blocks the probe target must
+        // not tear down an otherwise healthy tunnel. The health loop retries
+        // the probe and installs the route once it passes.
         this.#setState(
-          'failed',
-          'functional-probe-failed',
+          'degraded',
+          'probe-failed',
           `经本地入站的探测请求失败（${probe.error ?? `status ${probe.status}`}）。` +
-            '常见原因：uuid/flow/SNI/shortId/REALITY 公钥与服务端不一致，或远程不可达。' +
-            '确认链路正常后可设置 functionalProbe.enabled: false 只做 TCP 就绪检查。',
+            '进程保留、未接管流量；健康循环会继续重试。常见原因：uuid/flow/SNI/shortId/REALITY 公钥不一致，或探测目标不可达。',
         )
+        this.#startHealthLoop(generation)
         return
       }
     } else {
@@ -561,6 +566,44 @@ export class Supervisor {
     this.#restartTimer.unref?.()
   }
 
+  /** Retry the functional probe after a `probe-failed` degradation. */
+  async #retryProbeAndInstall() {
+    if (!this.config.functionalProbe.enabled) return
+    const host = this.config.inbound.host
+    const port = this.config.inbound.port
+    const probe = await this.#probes.httpProxyProbe({
+      host,
+      port,
+      url: this.config.functionalProbe.url,
+      timeoutMs: this.config.functionalProbe.timeoutMs,
+    })
+    if (!probe.ok) {
+      this.#logger?.warn?.(`功能探测仍未通过：${probe.error ?? probe.status ?? 'unknown'}`)
+      return
+    }
+    this.#functionalProbe = 'pass'
+    if (this.config.takeover === 'off') {
+      this.#setState('ready', 'takeover-off', 'xray 已就绪，但 takeover=off，未接管全局流量')
+      return
+    }
+    try {
+      const scheme = this.config.inbound.protocol === 'socks' ? 'socks5' : 'http'
+      const result = await this.#route.install({
+        proxyUrl: `${scheme}://${formatHost(host)}:${port}`,
+        noProxy: this.config.noProxy,
+        force: this.config.takeover === 'force',
+      })
+      if (result.reason === 'external-proxy-active') {
+        this.#setState('degraded', 'external-proxy-active', '启动器已有代理策略；未接管。设置 takeover: force 可强制覆盖')
+        return
+      }
+      await this.#applyActiveNode()
+      this.#setState('ready')
+    } catch (error) {
+      this.#setState('degraded', error.code ?? 'route-install-failed', error.message)
+    }
+  }
+
   #startHealthLoop(generation) {
     const interval = this.config.lifecycle.healthIntervalMs
     if (!(interval > 0)) return
@@ -578,7 +621,11 @@ export class Supervisor {
         if (this.#stopRequested || this.#stopped || generation !== this.#generation) return
         if (ok) {
           this.#unhealthy = 0
-          if (this.#state === 'degraded' && this.#reason === 'unhealthy') this.#setState('ready', 'health-recovered')
+          if (this.#state === 'degraded' && this.#reason === 'probe-failed') {
+            await this.#retryProbeAndInstall()
+          } else if (this.#state === 'degraded' && this.#reason === 'unhealthy') {
+            this.#setState('ready', 'health-recovered')
+          }
         } else {
           this.#unhealthy++
           if (this.#unhealthy >= this.config.lifecycle.unhealthyThreshold) {
@@ -646,6 +693,7 @@ export class Supervisor {
       detail: this.#detail ?? null,
       enabled: this.config.enabled,
       takeover: this.config.takeover,
+      settingsSchema: this.#schemaLoaded,
       nodes: this.config.nodes.map((node) => ({ id: node.id, tag: node.tag, address: node.address, port: node.port })),
       activeNode: this.#activeNode,
       control: this.#control ? { enabled: true, ...this.#control.snapshot() } : { enabled: false },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twinsearth/dsh-2xray",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "private": false,
   "description": "DSH-2Xray: supervises xray-core and routes DSH process-wide HTTP(S) traffic through its local inbound, with optional multi-node gRPC control plane",
   "type": "module",

package/test/client.test.js

@@ -45,12 +45,12 @@ test('the client bundle registers a main panel and a sidebar entry', async () =>
 
   assert.deepEqual(
     registrations.map((entry) => entry.definition.name),
-    ['main', 'sidebar.panellist'],
+    ['sidebar.panellist', 'main'],
   )
-  assert.equal(registrations[0].definition.key, 'xray')
-  assert.equal(registrations[1].definition.id, 'xray')
-  assert.equal(registrations[1].definition.order, 1)
-  assert.equal(registrations[1].definition.label(), '2Xray')
-  const icon = registrations[1].component()
+  assert.equal(registrations[0].definition.id, 'xray')
+  assert.equal(registrations[0].definition.order, 1)
+  assert.equal(registrations[0].definition.label(), '2Xray')
+  const icon = registrations[0].component()
   assert.equal(icon.type, 'svg')
+  assert.equal(registrations[1].definition.key, 'xray')
 })

package/test/logbuf.test.js

@@ -0,0 +1,32 @@
+import test from 'node:test'
+import assert from 'node:assert/strict'
+import { LogBuffer } from '../lib/logbuf.js'
+
+test('the log ring pages by cursor and reports the head', () => {
+  const ring = new LogBuffer(10)
+  ring.append('info', 'one')
+  ring.append('warn', 'two')
+  const first = ring.since(0)
+  assert.equal(first.items.length, 2)
+  assert.equal(first.cursor, 2)
+  const second = ring.since(first.cursor)
+  assert.equal(second.items.length, 0)
+  ring.append('error', 'three')
+  const third = ring.since(first.cursor)
+  assert.deepEqual(third.items.map((entry) => entry.text), ['three'])
+})
+
+test('the ring drops the oldest entries at capacity', () => {
+  const ring = new LogBuffer(3)
+  for (let index = 1; index <= 5; index++) ring.append('info', `line-${index}`)
+  const page = ring.since(0)
+  assert.deepEqual(page.items.map((entry) => entry.text), ['line-3', 'line-4', 'line-5'])
+  assert.equal(page.cursor, 5)
+})
+
+test('levels outside the known set fall back to info and text is bounded', () => {
+  const ring = new LogBuffer()
+  const entry = ring.append('verbose', 'x'.repeat(5000))
+  assert.equal(entry.level, 'info')
+  assert.equal(entry.text.length, 2000)
+})

package/test/supervisor.test.js

@@ -523,3 +523,35 @@ test('validateConfig reports a missing binary instead of throwing', async () =>
   }
 })
 
+test('a failing functional probe degrades but keeps the process alive', async () => {
+  const { dir, cleanup } = workdir()
+  try {
+    const config = makeConfig({ functionalProbe: { enabled: true, url: 'http://probe.invalid/', timeoutMs: 1000 } })
+    const log = []
+    const ready = readyProbes(log)
+    const { supervisor, route, launcher } = makeSupervisor({
+      dataDir: dir,
+      config,
+      log,
+      probes: {
+        async portIsFree() {
+          return true
+        },
+        waitForPort: ready.waitForPort,
+        async httpProxyProbe() {
+          return { ok: false, status: 502 }
+        },
+      },
+    })
+    await supervisor.start()
+    const snap = await supervisor.waitFor((s) => s.state === 'degraded')
+    assert.equal(snap.reason, 'probe-failed')
+    assert.equal(snap.process.alive, true)
+    assert.equal(route.installCalls, 0)
+    assert.equal(launcher.runs.length, 1)
+    await supervisor.stop()
+  } finally {
+    cleanup()
+  }
+})
+