@twinsearth/dsh-2xray 0.2.7 → 0.2.9

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## 0.2.9 — 2026-10-29
+
+### 内核分发
+
+- 新增按平台拆分的可选内核包（`@twinsearth/dsh-2xray-core-<os>-<arch>`），主包通过 `optionalDependencies` 引用，npm 只装当前平台。
+- `resolveBinary()` 新增 `core-package` 来源；未安装时继续回退到插件 `bin/`、数据目录、v2rayN 发现与 PATH。
+- 新增 `tools/build-core-packages.mjs`（官方 zip → npm 包）与 `.github/workflows/core-packages.yml`（下载、`.dgst` 校验、发布；无 `NPM_TOKEN` 时只上传 artifact）。
+
+### 验证
+
+- 真机 xray 26.9.30 对 global / cn-direct / whitelist 三种配置执行 `run -test` 全部通过（含 geodata 与 IPIfNonMatch）。
+
+## 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/README.md

@@ -328,6 +328,12 @@ v0.2.0 提供两个入口，互不替代：
 | 状态一直 `degraded` + `route-install-failed` | 查日志里的模块解析诊断；必要时确认 DSH 安装目录结构 |
 | `xray_switch_node` 报 `unknown service ... RoutingService` | xray 版本早于 2024-09；升级二进制，或关闭 `control.enabled` 只用 `activeNode` |
 
+### 平台内核包
+
+`@twinsearth/dsh-2xray` 通过 `optionalDependencies` 引用按平台拆分的核心包（例如 `@twinsearth/dsh-2xray-core-win32-x64`），npm 只安装当前平台那一个。本地没有可用内核包时，仍按 `插件 bin/ → 数据目录 → v2rayN 发现 → PATH` 回退，或用 `tools/install-xray-core.mjs` 安装。
+
+维护者用 `tools/build-core-packages.mjs` 从官方 zip 生成平台包；`.github/workflows/core-packages.yml` 会在具备 `NPM_TOKEN` secret 时自动下载、校验并发布各平台包。
+
 ## 路由模式与黑白名单
 
 - `global`（默认）：全部流量走 2Xray。

package/lib/binary.js

@@ -1,5 +1,6 @@
 import { accessSync, constants, existsSync, readdirSync } from 'node:fs'
-import { delimiter, join } from 'node:path'
+import { createRequire } from 'node:module'
+import { delimiter, dirname, join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
 /** Package root, so a bundle that ships its own `bin/xray(.exe)` is found first. */
@@ -29,6 +30,23 @@ function executableName() {
   return process.platform === 'win32' ? 'xray.exe' : 'xray'
 }
 
+/**
+ * Platform cores are published as separate optional packages so the main
+ * package stays small. npm installs only the matching os/cpu one.
+ */
+export function optionalCorePaths({ platform = process.platform, arch = process.arch, resolvePackage } = {}) {
+  const name = `@twinsearth/dsh-2xray-core-${platform}-${arch}`
+  const resolver = resolvePackage ?? ((specifier) => createRequire(import.meta.url).resolve(specifier))
+  try {
+    const manifest = resolver(`${name}/package.json`)
+    const base = dirname(manifest)
+    const executable = platform === 'win32' ? 'xray.exe' : 'xray'
+    return [...new Set([join(base, 'bin', executable), join(base, 'bin', 'xray')])]
+  } catch {
+    return []
+  }
+}
+
 function isExecutable(file) {
   try {
     accessSync(file, constants.X_OK)
@@ -56,12 +74,16 @@ export async function resolveBinary({
   packageRoot = PACKAGE_ROOT,
   discoveryRoots,
   discoveryOptions = {},
+  resolvePackage,
 }) {
   const candidates = []
   const explicit = config.binary.path?.trim()
   if (explicit) candidates.push({ path: explicit, source: 'config' })
   const fromEnv = process.env.DSH_XRAY_BIN?.trim()
   if (fromEnv) candidates.push({ path: fromEnv, source: 'env' })
+  for (const path of optionalCorePaths({ resolvePackage })) {
+    candidates.push({ path, source: 'core-package' })
+  }
   candidates.push({ path: join(packageRoot, 'bin', executableName()), source: 'bundled' })
   candidates.push({ path: join(packageRoot, 'bin', 'xray'), source: 'bundled' })
   candidates.push({ path: join(dataDir, 'bin', executableName()), source: 'managed' })

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.9",
   "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",
@@ -48,5 +48,8 @@
       ],
       "platform": "web"
     }
+  },
+  "optionalDependencies": {
+    "@twinsearth/dsh-2xray-core-win32-x64": "0.2.9"
   }
 }

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/binary.test.js

@@ -3,7 +3,7 @@ import assert from 'node:assert/strict'
 import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
-import { BinaryError, resolveBinary } from '../lib/binary.js'
+import { BinaryError, optionalCorePaths, resolveBinary } from '../lib/binary.js'
 import { normalizeConfig } from '../lib/config.js'
 
 const packageRoot = join('C:', 'plugins', 'dsh-2xray')
@@ -129,3 +129,14 @@ test('discovers a v2rayN layout when nothing else resolves', async () => {
     rmSync(dir, { recursive: true, force: true })
   }
 })
+
+test('optional platform core packages resolve on their own platform', () => {
+  const manifest = join('C:', 'profile', 'node_modules', '@twinsearth', 'dsh-2xray-core-darwin-arm64', 'package.json')
+  const paths = optionalCorePaths({
+    platform: 'darwin',
+    arch: 'arm64',
+    resolvePackage: () => manifest,
+  })
+  assert.deepEqual(paths, [join('C:', 'profile', 'node_modules', '@twinsearth', 'dsh-2xray-core-darwin-arm64', 'bin', 'xray')])
+  assert.deepEqual(optionalCorePaths({ platform: 'darwin', arch: 'arm64', resolvePackage: () => { throw new Error('missing') } }), [])
+})

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')

package/tools/build-core-packages.mjs

@@ -0,0 +1,114 @@
+#!/usr/bin/env node
+/**
+ * Turn official Xray-core zips into per-platform npm packages.
+ *
+ * npm installs only the package whose `os`/`cpu` matches, so the main package
+ * can depend on all of them without downloading five cores. CI can run this on
+ * each runner (where GitHub release downloads work); locally it also accepts a
+ * directory of already-downloaded zips.
+ *
+ * Usage:
+ *   node tools/build-core-packages.mjs --zips ./vendor/zips --out ./dist-core --version 0.2.9
+ *
+ * Expected zip names (official release assets):
+ *   Xray-windows-64.zip, Xray-windows-arm64-v8a.zip
+ *   Xray-macos-64.zip, Xray-macos-arm64-v8a.zip
+ *   Xray-linux-64.zip, Xray-linux-arm64-v8a.zip
+ */
+import { copyFileSync, existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, rmSync, statSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { spawnSync } from 'node:child_process'
+
+const TARGETS = [
+  { zip: 'Xray-windows-64.zip', pkg: 'win32-x64', os: 'win32', cpu: 'x64', exe: 'xray.exe' },
+  { zip: 'Xray-windows-arm64-v8a.zip', pkg: 'win32-arm64', os: 'win32', cpu: 'arm64', exe: 'xray.exe' },
+  { zip: 'Xray-macos-64.zip', pkg: 'darwin-x64', os: 'darwin', cpu: 'x64', exe: 'xray' },
+  { zip: 'Xray-macos-arm64-v8a.zip', pkg: 'darwin-arm64', os: 'darwin', cpu: 'arm64', exe: 'xray' },
+  { zip: 'Xray-linux-64.zip', pkg: 'linux-x64', os: 'linux', cpu: 'x64', exe: 'xray' },
+  { zip: 'Xray-linux-arm64-v8a.zip', pkg: 'linux-arm64', os: 'linux', cpu: 'arm64', exe: 'xray' },
+]
+
+function args() {
+  const parsed = {}
+  for (let index = 2; index < process.argv.length; index += 2) {
+    const key = process.argv[index].replace(/^--/, '')
+    parsed[key] = process.argv[index + 1]
+  }
+  return {
+    zips: parsed.zips ?? './vendor/zips',
+    out: parsed.out ?? './dist-core',
+    version: parsed.version ?? JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8')).version,
+  }
+}
+
+function extract(zip, destination) {
+  const attempts =
+    process.platform === 'win32'
+      ? [['tar', ['-xf', zip, '-C', destination]], ['powershell', ['-NoProfile', '-Command', `Expand-Archive -LiteralPath '${zip}' -DestinationPath '${destination}' -Force`]]]
+      : [['unzip', ['-o', zip, '-d', destination]], ['tar', ['-xf', zip, '-C', destination]]]
+  for (const [command, argv] of attempts) {
+    if (spawnSync(command, argv, { stdio: 'ignore' }).status === 0) return
+  }
+  throw new Error(`could not extract ${zip}`)
+}
+
+function findBinary(dir, name) {
+  for (const entry of readdirSync(dir, { withFileTypes: true })) {
+    const full = join(dir, entry.name)
+    if (entry.isFile() && entry.name === name) return full
+    if (entry.isDirectory()) {
+      const nested = findBinary(full, name)
+      if (nested) return nested
+    }
+  }
+  return undefined
+}
+
+const options = args()
+mkdirSync(options.out, { recursive: true })
+const built = []
+for (const target of TARGETS) {
+  const zip = join(options.zips, target.zip)
+  if (!existsSync(zip)) {
+    console.log(`skip ${target.pkg}: ${target.zip} not present`)
+    continue
+  }
+  const workspace = mkdtempSync(join(tmpdir(), `dsh-core-${target.pkg}-`))
+  try {
+    extract(zip, workspace)
+    const binary = findBinary(workspace, target.exe)
+    if (!binary) throw new Error(`${target.exe} not found in ${target.zip}`)
+    const packageName = `@twinsearth/dsh-2xray-core-${target.pkg}`
+    const dir = join(options.out, `dsh-2xray-core-${target.pkg}`)
+    mkdirSync(join(dir, 'bin'), { recursive: true })
+    copyFileSync(binary, join(dir, 'bin', target.exe))
+    writeFileSync(
+      join(dir, 'package.json'),
+      JSON.stringify(
+        {
+          name: packageName,
+          version: options.version,
+          description: `Xray-core binary for ${target.pkg} (DSH-2Xray optional dependency)`,
+          license: 'MPL-2.0',
+          os: [target.os],
+          cpu: [target.cpu],
+          files: ['bin'],
+        },
+        null,
+        2,
+      ) + '\n',
+    )
+    built.push({ name: packageName, dir, size: statSync(join(dir, 'bin', target.exe)).size })
+  } finally {
+    rmSync(workspace, { recursive: true, force: true })
+  }
+}
+
+for (const entry of built) {
+  console.log(`built ${entry.name} (${Math.round(entry.size / 1048576)} MB) -> ${entry.dir}`)
+}
+if (built.length === 0) {
+  console.log(`no zips found in ${options.zips}`)
+  process.exitCode = 1
+}