@twinsearth/dsh-2xray 0.3.3 → 0.3.5

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 0.3.5 — 2026-10-29
+
+### 规则数据
+
+- 新增 `geodata.autoUpdate`（默认 true）：XTLS 主源 + jsDelivr 回退，下载 `geoip.dat`/`geosite.dat` 并原子替换。
+- 首次缺失时在启动前下载；之后每 12 小时检查，更新后调用 `supervisor.restart()` 让 xray 重新加载。
+- 小于 100KB 的响应视为错误页，不会覆盖现有文件。
+- 设置页新增「每日更新规则数据」勾选框。
+- 实测确认 Xray 的顶层 `geodata` 块只被解析、不执行 cron，因此由插件侧实现。
+
+## 0.3.4 — 2026-10-29
+
+### 修复
+
+- 侧边栏标题不再写死「全局代理」：读取 `status.routing.mode`，显示「全局代理 / 国内直连 / 白名单代理」；geodata 缺失降级时追加「已降级全局」。
+- 状态卡增加「路由：…」一栏，并同步显示降级原因。
+- 状态快照新增 `routing` 字段（mode / whitelist / blacklist）。
+
 ## 0.3.3 — 2026-10-29
 
 ### 健康检查与发布

package/README.md

@@ -334,6 +334,12 @@ v0.2.0 提供两个入口，互不替代：
 
 维护者用 `tools/build-core-packages.mjs` 从官方 zip 生成平台包；`.github/workflows/core-packages.yml` 会在具备 `NPM_TOKEN` secret 时自动下载、校验并发布各平台包。
 
+## 规则数据自动更新
+
+设置页默认勾选「每日更新规则数据」：Host 会下载 XTLS 的 `geoip-lite.dat` / `geosite.dat`，失败时回退 jsDelivr（Loyalsoldier）；文件小于 100KB 视为错误页并拒绝替换。首次缺失时在启动前下载，之后每 12 小时检查一次，更新成功后重启 xray 热加载。
+
+> Xray 26.9.30 接受顶层 `geodata` 配置块但实测不执行其 cron（85 秒内无下载），因此更新由插件完成，不依赖该字段。
+
 ## 健康检查
 
 - 进程内（需 DSH 会话鉴权）：`GET /api/xray/healthz` → `{ "ok": true, "version": "v0.3.3", ... }`

package/index.js

@@ -9,6 +9,7 @@ import { installTools } from './lib/tools.js'
 import { LogBuffer } from './lib/logbuf.js'
 import { Monitor } from './lib/monitor.js'
 import { checkForUpdate, installUpdate, ownVersion } from './lib/update.js'
+import { geodataStatus, updateGeodata } from './lib/geodata.js'
 
 export const name = 'dsh-2xray'
 
@@ -172,6 +173,7 @@ export function apply(ctx, rawConfig) {
                     vpnName: node?.id ?? snapshot.activeNode ?? null,
                     probe: monitor.snapshot(),
                     update: updateState,
+                    geodata: geodataStatus(dataDir),
                   },
                   logs: page.items,
                   cursor: page.cursor,
@@ -281,10 +283,38 @@ export function apply(ctx, rawConfig) {
     'dsh-2xray/xray-supervisor',
   )
 
-  // Detached by design: activation must not block the harness boot on xray
-  // startup. Every rejection is caught — an unhandled one would dispose the
-  // whole application.
-  supervisor.start().catch((error) => logger.error(`xray 监督器异常：${String(error)}`))
+  const needsGeodata = config.routing?.mode === 'cn-direct' || config.routing?.geositeCn || config.routing?.blockAds
+  const boot = async () => {
+    if (dataDir && config.geodata?.autoUpdate !== false) {
+      const status = geodataStatus(dataDir)
+      if (status.missing.length > 0 && needsGeodata) {
+        // Download before the first spawn, otherwise cn-direct would either
+        // fail or degrade to global on a fresh machine.
+        const result = await updateGeodata({ dataDir, logger, timeoutMs: 20_000 }).catch((error) => ({
+          updated: [],
+          failed: ['download'],
+          error,
+        }))
+        if (result?.updated?.length > 0) logger.info('规则数据已下载，使用最新 geodata 启动 xray')
+      }
+      const refresh = () => {
+        ;(async () => {
+          if (!geodataStatus(dataDir).stale) return
+          const result = await updateGeodata({ dataDir, logger })
+          if (result?.updated?.length > 0) {
+            logger.info('规则数据已更新，重启 xray 加载新数据')
+            await supervisor.restart('geodata-updated')
+          }
+        })().catch((error) => logger.warn(`规则数据更新失败：${String(error)}`))
+      }
+      const first = setTimeout(refresh, 60_000)
+      const daily = setInterval(refresh, 12 * 60 * 60 * 1000)
+      first.unref?.()
+      daily.unref?.()
+    }
+    await supervisor.start()
+  }
+  boot().catch((error) => logger.error(`xray 监督器异常：${String(error)}`))
   installTools({ ctx, supervisor, logger }).catch((error) => logger.warn(`安装 xray_* 工具失败：${String(error)}`))
 
   return dispose

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}（代理本身可能仍在工作）`)
@@ -319,6 +326,7 @@ window.__ModuleLoader__.load({
       const [autoUpdate, setAutoUpdate] = React.useState(value.updates?.auto === true)
       const [updateInfo, setUpdateInfo] = React.useState(null)
       const [updateBusy, setUpdateBusy] = React.useState('')
+      const [autoGeodata, setAutoGeodata] = React.useState(value.geodata?.autoUpdate !== false)
       const [message, setMessage] = React.useState('')
       const [kind, setKind] = React.useState('')
       const [busy, setBusy] = React.useState(false)
@@ -471,6 +479,7 @@ window.__ModuleLoader__.load({
             { path: ['routing', 'whitelist'], value: splitList(whitelist) },
             { path: ['routing', 'blacklist'], value: splitList(blacklist) },
             { path: ['updates', 'auto'], value: autoUpdate },
+            { path: ['geodata', 'autoUpdate'], value: autoGeodata },
           ]
           if (binaryPath.trim()) fields.push({ path: ['binary', 'path'], value: binaryPath.trim() })
           const numericPort = Number(port)
@@ -542,7 +551,9 @@ window.__ModuleLoader__.load({
             onClick: installNow,
           }, updateBusy === 'install' ? '更新中…' : '立即更新'),
           h('label', { style: { fontSize: 12.5, display: 'flex', alignItems: 'center', gap: 6 } },
-            h('input', { type: 'checkbox', checked: autoUpdate, onChange: (event) => setAutoUpdate(event.target.checked) }), '自动更新')),
+            h('input', { type: 'checkbox', checked: autoUpdate, onChange: (event) => setAutoUpdate(event.target.checked) }), '自动更新'),
+          h('label', { style: { fontSize: 12.5, display: 'flex', alignItems: 'center', gap: 6 } },
+            h('input', { type: 'checkbox', checked: autoGeodata, onChange: (event) => setAutoGeodata(event.target.checked) }), '每日更新规则数据')),
         h('div', { style: { ...C.muted, fontSize: 12, marginTop: 6 } },
           updateInfo
             ? `当前 ${updateInfo.current} · 最新 ${updateInfo.latest ?? '未知'}${updateInfo.available ? '（可更新）' : '（已是最新）'}` +

package/lib/config.js

@@ -70,6 +70,7 @@ export const DEFAULT_CONFIG = {
     timeoutMs: 3000,
   },
   updates: { auto: false },
+  geodata: { autoUpdate: true },
   binary: { path: '', dataDir: '' },
   lifecycle: {
     startTimeoutMs: 15000,
@@ -353,6 +354,8 @@ export function normalizeConfig(raw) {
 
   merged.updates = merged.updates ?? {}
   merged.updates.auto = asBool(merged.updates.auto, false)
+  merged.geodata = merged.geodata ?? {}
+  merged.geodata.autoUpdate = asBool(merged.geodata.autoUpdate, true)
 
   const control = merged.control
   control.enabled = asBool(control.enabled, false)

package/lib/geodata.js

@@ -0,0 +1,96 @@
+import { mkdirSync, renameSync, rmSync, statSync, writeFileSync } from 'node:fs'
+import { join } from 'node:path'
+
+const DAY_MS = 24 * 60 * 60 * 1000
+const MIN_BYTES = 100_000
+
+export const GEODATA_FILES = [
+  {
+    file: 'geoip.dat',
+    urls: [
+      'https://github.com/XTLS/Xray-rules-dat/releases/latest/download/geoip-lite.dat',
+      'https://cdn.jsdelivr.net/gh/Loyalsoldier/v2ray-rules-dat@release/geoip.dat',
+    ],
+  },
+  {
+    file: 'geosite.dat',
+    urls: [
+      'https://github.com/XTLS/Xray-rules-dat/releases/latest/download/geosite.dat',
+      'https://cdn.jsdelivr.net/gh/Loyalsoldier/v2ray-rules-dat@release/geosite.dat',
+    ],
+  },
+]
+
+export function geodataStatus(dataDir) {
+  if (!dataDir) return { files: [], stale: true, missing: GEODATA_FILES.map((entry) => entry.file) }
+  const files = []
+  const missing = []
+  let oldest = Infinity
+  for (const entry of GEODATA_FILES) {
+    const path = join(dataDir, entry.file)
+    try {
+      const stat = statSync(path)
+      files.push({ file: entry.file, size: stat.size, mtimeMs: stat.mtimeMs })
+      oldest = Math.min(oldest, stat.mtimeMs)
+    } catch {
+      missing.push(entry.file)
+    }
+  }
+  return {
+    files,
+    missing,
+    stale: missing.length > 0 || Date.now() - oldest > DAY_MS,
+    updatedAt: files.length > 0 ? Math.min(...files.map((entry) => entry.mtimeMs)) : null,
+  }
+}
+
+async function download(url, timeoutMs) {
+  const response = await fetch(url, { redirect: 'follow', signal: AbortSignal.timeout(timeoutMs) })
+  if (!response.ok) throw new Error(`HTTP ${response.status}`)
+  const bytes = Buffer.from(await response.arrayBuffer())
+  if (bytes.length < MIN_BYTES) throw new Error(`payload too small (${bytes.length} B)`)
+  return bytes
+}
+
+/**
+ * Xray accepts a top-level `geodata` block but does not execute its cron (live
+ * test: no download within 85 s), so the host performs the update itself and
+ * restarts the child afterwards. Writes are atomic per file.
+ */
+export async function updateGeodata({ dataDir, logger, timeoutMs = 30_000, force = false, files = GEODATA_FILES } = {}) {
+  if (!dataDir) return { updated: [], failed: [], skipped: true }
+  mkdirSync(dataDir, { recursive: true })
+  const status = geodataStatus(dataDir)
+  if (!force && !status.stale) {
+    return { updated: [], failed: [], skipped: true, status }
+  }
+  const updated = []
+  const failed = []
+  for (const entry of files) {
+    const target = join(dataDir, entry.file)
+    let done = false
+    for (const url of entry.urls) {
+      try {
+        const bytes = await download(url, timeoutMs)
+        const temporary = `${target}.tmp-${process.pid}`
+        writeFileSync(temporary, bytes)
+        renameSync(temporary, target)
+        updated.push({ file: entry.file, bytes: bytes.length, url })
+        logger?.info?.(`规则数据已更新：${entry.file}（${(bytes.length / 1048576).toFixed(1)} MB）`)
+        done = true
+        break
+      } catch (error) {
+        logger?.warn?.(`下载 ${entry.file} 失败（${url}）：${String(error.message ?? error)}`)
+      }
+    }
+    if (!done) {
+      failed.push(entry.file)
+      try {
+        rmSync(`${target}.tmp-${process.pid}`, { force: true })
+      } catch {
+        // ignore
+      }
+    }
+  }
+  return { updated, failed, status: geodataStatus(dataDir) }
+}

package/lib/schema.js

@@ -113,4 +113,10 @@ export const Config = Schema.object({
       .description('启动时检查 npm 上的新版本并自动安装；重启 DSH 后生效。')
       .volatile(),
   }),
+  geodata: Schema.object({
+    autoUpdate: Schema.boolean()
+      .default(true)
+      .description('每日自动下载 geoip.dat/geosite.dat（XTLS 主源，jsDelivr 回退），更新后重启 xray。')
+      .volatile(),
+  }),
 })

package/lib/supervisor.js

@@ -165,6 +165,12 @@ export class Supervisor {
     return this.#startTask
   }
 
+  /** Restart the child so a freshly downloaded geodata set is loaded. */
+  async restart(reason = 'manual') {
+    if (this.#stopped || this.#stopRequested) return
+    await this.#recycle(reason)
+  }
+
   async stop() {
     if (this.#stopped) return
     this.#stopped = true
@@ -732,6 +738,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.5",
   "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/geodata.test.js

@@ -0,0 +1,78 @@
+import test from 'node:test'
+import assert from 'node:assert/strict'
+import http from 'node:http'
+import { existsSync, mkdtempSync, readFileSync, rmSync, statSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { geodataStatus, updateGeodata } from '../lib/geodata.js'
+
+async function withServer(payload, run) {
+  const server = http.createServer((request, response) => {
+    response.writeHead(200, { 'content-type': 'application/octet-stream' })
+    response.end(payload)
+  })
+  await new Promise((resolve) => server.listen(0, '127.0.0.1', resolve))
+  const { port } = server.address()
+  try {
+    return await run(`http://127.0.0.1:${port}`)
+  } finally {
+    server.close()
+  }
+}
+
+test('downloads a geodata file atomically and reports freshness', async () => {
+  const dir = mkdtempSync(join(tmpdir(), 'dsh-geodata-'))
+  try {
+    const payload = Buffer.alloc(200_000, 0x1f)
+    await withServer(payload, async (base) => {
+      const result = await updateGeodata({
+        dataDir: dir,
+        force: true,
+        files: [{ file: 'geoip.dat', urls: [`${base}/geoip.dat`] }],
+      })
+      assert.deepEqual(result.updated.map((entry) => entry.file), ['geoip.dat'])
+      assert.equal(existsSync(join(dir, 'geoip.dat')), true)
+      assert.equal(statSync(join(dir, 'geoip.dat')).size, payload.length)
+      assert.deepEqual(geodataStatus(dir).missing, ['geosite.dat'])
+    })
+  } finally {
+    rmSync(dir, { recursive: true, force: true })
+  }
+})
+
+test('a tiny payload is rejected instead of replacing the file', async () => {
+  const dir = mkdtempSync(join(tmpdir(), 'dsh-geodata-'))
+  try {
+    await withServer(Buffer.from('<html>blocked</html>'), async (base) => {
+      const result = await updateGeodata({
+        dataDir: dir,
+        force: true,
+        files: [{ file: 'geosite.dat', urls: [`${base}/geosite.dat`] }],
+      })
+      assert.deepEqual(result.updated, [])
+      assert.deepEqual(result.failed, ['geosite.dat'])
+      assert.equal(existsSync(join(dir, 'geosite.dat')), false)
+    })
+  } finally {
+    rmSync(dir, { recursive: true, force: true })
+  }
+})
+
+test('fresh files are skipped unless forced', async () => {
+  const dir = mkdtempSync(join(tmpdir(), 'dsh-geodata-'))
+  try {
+    const payload = Buffer.alloc(200_000, 0x1f)
+    await withServer(payload, async (base) => {
+      const files = [
+        { file: 'geoip.dat', urls: [`${base}/geoip.dat`] },
+        { file: 'geosite.dat', urls: [`${base}/geosite.dat`] },
+      ]
+      await updateGeodata({ dataDir: dir, force: true, files })
+      const second = await updateGeodata({ dataDir: dir, files })
+      assert.equal(second.skipped, true)
+      assert.equal(readFileSync(join(dir, 'geosite.dat')).length, payload.length)
+    })
+  } finally {
+    rmSync(dir, { recursive: true, force: true })
+  }
+})