@twinsearth/dsh-2xray 0.2.4 → 0.2.5

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.2.5 — 2026-10-29
+
+### 修复
+
+- **binary-missing 自动恢复**：未配置 `binary.path` 时，会按 `V2RAYN_HOME/V2RAYN_PATH`、`%LOCALAPPDATA%`、桌面/下载、Program Files、盘符根目录做有界搜索（只进入名字含 v2ray 的目录，3s 预算），识别 v2rayN 7.x 的 `bin/xray/xray.exe` 并直接借用。
+- 找不到时错误信息仍列出显式候选与 PATH，便于诊断。
+
 ## 0.2.4 — 2026-10-29
 
 ### 设置页与导入

package/lib/binary.js

@@ -1,4 +1,4 @@
-import { accessSync, constants, existsSync } from 'node:fs'
+import { accessSync, constants, existsSync, readdirSync } from 'node:fs'
 import { delimiter, join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
@@ -54,6 +54,8 @@ export async function resolveBinary({
   launcher,
   exists = isExecutable,
   packageRoot = PACKAGE_ROOT,
+  discoveryRoots,
+  discoveryOptions = {},
 }) {
   const candidates = []
   const explicit = config.binary.path?.trim()
@@ -90,14 +92,91 @@ export async function resolveBinary({
     }
   }
 
+  // v2rayN / v2rayN-core ship xray under their own directory (7.x uses
+  // bin/xray/xray.exe). Borrowing it avoids asking the user to copy a binary.
+  const discovered = discoverXray({ roots: discoveryRoots, ...discoveryOptions })
+  if (discovered.length > 0) {
+    return { path: discovered[0], source: 'discovered' }
+  }
+
   throw new BinaryError(
     `找不到 xray-core 可执行文件。已尝试：${candidates.map((candidate) => candidate.path).join(', ') || '(无显式路径)'}，以及 PATH 中的 ${pathEntries.join(delimiter)}。` +
       '请把 xray 放进插件自己的 bin/、数据目录的 bin/，或设置 config.binary.path。',
     'binary-missing',
-    candidates.map((candidate) => candidate.path),
+    [...candidates.map((candidate) => candidate.path), ...discovered],
   )
 }
 
+/** Common install roots for a borrowed xray binary (Windows-first). */
+export function defaultDiscoveryRoots() {
+  const home = process.env.USERPROFILE ?? process.env.HOME ?? ''
+  const local = process.env.LOCALAPPDATA ?? ''
+  const roots = [
+    process.env.V2RAYN_HOME,
+    process.env.V2RAYN_PATH,
+    local,
+    home ? join(home, 'Desktop') : '',
+    home ? join(home, 'Downloads') : '',
+    'C:\\Program Files',
+    'C:\\Program Files (x86)',
+    'D:\\',
+    'E:\\',
+    'C:\\',
+  ]
+  return [...new Set(roots.filter((root) => typeof root === 'string' && root.length > 0))]
+}
+
+/**
+ * Bounded search for a v2rayN-style xray layout. Directory names must look
+ * like v2rayN, so the walk does not crawl unrelated trees; the time budget
+ * keeps a failed start from stalling activation.
+ */
+export function discoverXray({ roots = defaultDiscoveryRoots(), timeBudgetMs = 3000, max = 5 } = {}) {
+  const found = []
+  const deadline = Date.now() + timeBudgetMs
+  const skipped = /^(windows|programdata|recovery|\$recycle\.bin|system volume information|node_modules|\.git|appdata|temp)$/i
+  const layouts = [
+    ['bin', 'xray', 'xray.exe'],
+    ['bin', 'xray', 'xray'],
+    ['bin', 'xray.exe'],
+    ['bin', 'xray'],
+    ['xray.exe'],
+    ['xray'],
+  ]
+  const check = (dir) => {
+    for (const parts of layouts) {
+      const candidate = join(dir, ...parts)
+      if (existsSync(candidate)) {
+        if (!found.includes(candidate)) found.push(candidate)
+        return
+      }
+    }
+  }
+  const visit = (dir, depth) => {
+    if (found.length >= max || Date.now() > deadline) return
+    let entries
+    try {
+      entries = readdirSync(dir, { withFileTypes: true })
+    } catch {
+      return
+    }
+    for (const entry of entries) {
+      if (found.length >= max || Date.now() > deadline) return
+      if (!entry.isDirectory()) continue
+      const name = entry.name
+      if (skipped.test(name)) continue
+      const full = join(dir, name)
+      if (/v2ray/i.test(name)) check(full)
+      if (depth < 3) visit(full, depth + 1)
+    }
+  }
+  for (const root of roots) {
+    if (found.length >= max || Date.now() > deadline) break
+    if (existsSync(root)) visit(root, 0)
+  }
+  return found
+}
+
 /**
  * Run `xray version` and parse the version line. A failed probe (missing
  * dynamic library, wrong architecture, antivirus block) is a startup failure,

package/package.json

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

@@ -1,5 +1,7 @@
 import test from 'node:test'
 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 { normalizeConfig } from '../lib/config.js'
@@ -89,6 +91,7 @@ test('a missing binary fails with every candidate listed', async () => {
           packageRoot,
           exists: () => false,
           launcher: {},
+          discoveryRoots: [],
         }),
       (error) => {
         assert.ok(error instanceof BinaryError)
@@ -101,3 +104,28 @@ test('a missing binary fails with every candidate listed', async () => {
     process.env.PATH = previousPath
   }
 })
+
+test('discovers a v2rayN layout when nothing else resolves', async () => {
+  const dir = mkdtempSync(join(tmpdir(), 'dsh-xray-discover-'))
+  const previousPath = process.env.PATH
+  try {
+    const layout = join(dir, 'v2rayN-windows-64', 'bin', 'xray')
+    mkdirSync(layout, { recursive: true })
+    writeFileSync(join(layout, 'xray.exe'), '')
+    process.env.PATH = ''
+    const found = await resolveBinary({
+      config: config(),
+      dataDir: join(dir, 'data'),
+      packageRoot: join(dir, 'plugin'),
+      exists: () => false,
+      launcher: {},
+      discoveryRoots: [dir],
+      discoveryOptions: { timeBudgetMs: 2000 },
+    })
+    assert.equal(found.source, 'discovered')
+    assert.ok(found.path.endsWith('xray.exe'))
+  } finally {
+    process.env.PATH = previousPath
+    rmSync(dir, { recursive: true, force: true })
+  }
+})