@twinsearth/dsh-2xray 0.3.3 → 0.3.4

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.3.4 — 2026-10-29
+
+### 修复
+
+- 侧边栏标题不再写死「全局代理」：读取 `status.routing.mode`，显示「全局代理 / 国内直连 / 白名单代理」；geodata 缺失降级时追加「已降级全局」。
+- 状态卡增加「路由：…」一栏，并同步显示降级原因。
+- 状态快照新增 `routing` 字段（mode / whitelist / blacklist）。
+
 ## 0.3.3 — 2026-10-29
 
 ### 健康检查与发布

package/lib/client.js

@@ -199,6 +199,8 @@ window.__ModuleLoader__.load({
     }
 
     function StatusCard({ status, latency, egress, phase }) {
+      const routingLabel =
+        { global: '全局', 'cn-direct': '国内直连', whitelist: '白名单' }[status?.routing?.mode] ?? '全局'
       return h('section', { style: C.card },
         h('div', { style: C.cardHead }, '③ 连接状态'),
         h('div', { style: { display: 'flex', alignItems: 'center', gap: 10, flexWrap: 'wrap' } },
@@ -209,6 +211,8 @@ window.__ModuleLoader__.load({
             egress?.ip ? `出口 IP ${egress.ip}${egress.country ? ` (${egress.country})` : ''}` : '出口 IP —')),
         h('div', { style: { ...C.muted, fontSize: 12.5, marginTop: 6 } },
           `节点「${status?.vpnName ?? status?.activeNode ?? '—'}」` +
+            ` · 路由：${routingLabel}` +
+            (status?.routingFallback ? '（geodata 缺失，已降级全局）' : '') +
             (status?.route?.installed ? ` · ${status.route.mode === 'harness' ? 'DSH 策略已接管' : '内置 dispatcher'}` : ' · 尚未接管')))
     }
 
@@ -238,13 +242,16 @@ window.__ModuleLoader__.load({
       const latency = probe.latency?.ms
       const egress = probe.egress ?? {}
       const localEndpoint = status ? `127.0.0.1:${status.port}` : '—'
+      const routingLabel =
+        { global: '全局代理', 'cn-direct': '国内直连', whitelist: '白名单代理' }[status?.routing?.mode] ?? '全局代理'
+      const fallbackNote = status?.routingFallback ? ' · geodata 缺失，已降级全局' : ''
 
       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('p', { style: C.sub }, `Xray ${routingLabel} · 本地 ${localEndpoint}${fallbackNote}`)),
           h(StatusPill, { status })),
         error
           ? h('div', { style: { ...C.card, ...C.error, fontSize: 12.5 } }, `状态通道不可用：${error}（代理本身可能仍在工作）`)

package/lib/supervisor.js

@@ -732,6 +732,11 @@ export class Supervisor {
       takeover: this.config.takeover,
       settingsSchema: this.#schemaLoaded,
       routingFallback: this.#routingFallback,
+      routing: {
+        mode: this.config.routing?.mode ?? 'global',
+        whitelist: this.config.routing?.whitelist ?? [],
+        blacklist: this.config.routing?.blacklist ?? [],
+      },
       nodes: this.config.nodes.map((node) => ({
         id: node.id,
         tag: node.tag,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twinsearth/dsh-2xray",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "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",