@twinsearth/dsh-2xray 0.2.7 → 0.2.8

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.2.8 — 2026-10-29
+
+### 修复
+
+- `cn-direct` 模式设置 `routing.domainStrategy: IPIfNonMatch`：未被 `geosite:cn` 命中的域名会解析为 IP 再匹配 `geoip:cn`，国内站点不再漏判。
+- `XRAY_LOCATION_ASSET` 显式传入 `run` 与 `run -test` 的 spawn 环境：服务启动器会清理环境，之前 geodata 路径可能丢失，导致 `geoip:cn`/`geosite:cn` 静默失效。
+- 启动与 `xray_validate_config` 前都先复制 `geoip.dat`/`geosite.dat` 到数据目录；缺失时日志明确告警。
+
 ## 0.2.7 — 2026-10-29
 
 ### 新增

package/lib/supervisor.js

@@ -279,7 +279,9 @@ export class Supervisor {
         argv: [binary.path, 'run', '-c', configPath],
         cwd: this.dataDir,
         graceMs: Math.max(500, lifecycle.stopGraceMs),
-        env: {},
+        // geodata is copied next to the managed config; without this env the
+        // scrubbed service environment makes geoip:cn/geosite:cn fail silently.
+        env: this.dataDir ? { XRAY_LOCATION_ASSET: this.dataDir } : {},
       })
     } catch (error) {
       this.#setState('failed', 'spawn-failed', String(error))
@@ -455,7 +457,7 @@ export class Supervisor {
         argv: [binaryPath, 'run', '-test', '-c', configPath],
         cwd: this.dataDir ?? process.cwd(),
         graceMs: 2000,
-        env: {},
+        env: this.dataDir ? { XRAY_LOCATION_ASSET: this.dataDir } : {},
       })
     } catch (error) {
       return { ok: false, detail: String(error) }
@@ -503,6 +505,11 @@ export class Supervisor {
       }
     }
 
+    const routing = this.config.routing ?? {}
+    if (routing.mode === 'cn-direct' || routing.geositeCn || routing.blockAds) {
+      ensureXrayAssets({ binaryPath: binary.path, dataDir: this.dataDir, logger: this.#logger })
+    }
+
     const built = buildXrayConfig(this.config)
     const text = JSON.stringify(built, null, 2)
     const file = join(this.dataDir, 'conf', `validate-${Date.now()}-${process.pid}.json`)

package/lib/xray-config.js

@@ -231,7 +231,9 @@ export function buildXrayConfig(config) {
     inbounds,
     outbounds,
     routing: {
-      domainStrategy: 'AsIs',
+      // cn-direct relies on resolving unmatched domains to match geoip:cn;
+      // global/whitelist stay AsIs so no extra DNS lookups are introduced.
+      domainStrategy: mode === 'cn-direct' ? 'IPIfNonMatch' : 'AsIs',
       rules,
       ...(balancers.length > 0 ? { balancers } : {}),
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twinsearth/dsh-2xray",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "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/assets.test.js

@@ -0,0 +1,35 @@
+import test from 'node:test'
+import assert from 'node:assert/strict'
+import { existsSync, mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { ensureXrayAssets } from '../lib/assets.js'
+
+test('geodata next to a v2rayN binary is copied into the managed data dir', () => {
+  const root = mkdtempSync(join(tmpdir(), 'dsh-xray-assets-'))
+  try {
+    const bin = join(root, 'v2rayN-windows-64', 'bin')
+    const xrayDir = join(bin, 'xray')
+    mkdirSync(xrayDir, { recursive: true })
+    writeFileSync(join(bin, 'geoip.dat'), 'geoip')
+    writeFileSync(join(bin, 'geosite.dat'), 'geosite')
+    const dataDir = join(root, 'data')
+    const result = ensureXrayAssets({ binaryPath: join(xrayDir, 'xray.exe'), dataDir })
+    assert.deepEqual(result.copied.sort(), ['geoip.dat', 'geosite.dat'])
+    assert.equal(existsSync(join(dataDir, 'geoip.dat')), true)
+    assert.equal(existsSync(join(dataDir, 'geosite.dat')), true)
+  } finally {
+    rmSync(root, { recursive: true, force: true })
+  }
+})
+
+test('missing geodata is reported rather than silently ignored', () => {
+  const root = mkdtempSync(join(tmpdir(), 'dsh-xray-assets-'))
+  try {
+    const result = ensureXrayAssets({ binaryPath: join(root, 'xray.exe'), dataDir: join(root, 'data') })
+    assert.deepEqual(result.copied, [])
+    assert.deepEqual(result.missing.sort(), ['geoip.dat', 'geosite.dat'])
+  } finally {
+    rmSync(root, { recursive: true, force: true })
+  }
+})

package/test/routing.test.js

@@ -26,6 +26,7 @@ test('global mode keeps the proxy catch-all and private direct rule', () => {
   const { config, errors } = base()
   assert.deepEqual(errors, [])
   const rules = rulesOf(config)
+  assert.equal(buildXrayConfig(config).routing.domainStrategy, 'AsIs')
   assert.ok(rules.some((rule) => Array.isArray(rule.ip) && rule.ip.includes('10.0.0.0/8')))
   const catchAll = rules[rules.length - 1]
   assert.equal(catchAll.network, 'tcp,udp')
@@ -35,6 +36,7 @@ test('global mode keeps the proxy catch-all and private direct rule', () => {
 test('cn-direct adds geosite:cn and geoip:cn direct rules', () => {
   const { config } = base({ routing: { mode: 'cn-direct' } })
   const rules = rulesOf(config)
+  assert.equal(buildXrayConfig(config).routing.domainStrategy, 'IPIfNonMatch')
   assert.ok(rules.some((rule) => rule.domain?.includes('geosite:cn')))
   assert.ok(rules.some((rule) => rule.ip?.includes('geoip:cn')))
   assert.equal(rules[rules.length - 1].outboundTag, 'proxy')