@twinsearth/dsh-2xray 0.2.4 → 0.2.6

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 0.2.6 — 2026-10-29
+
+### 内置浏览器支持
+
+- 新增 `tools/launch-with-browser-proxy.cmd`：以 `--proxy-server=http://127.0.0.1:20808` 启动 DSH，让内置 Chromium 浏览器也走插件的 xray。
+- 设置页与插件页卡片增加说明：Node 插件无法在运行时修改 Chromium 的 session 代理，必须带启动参数重启；系统代理/TUN 是另一条全机路径。
+- 保留边界：插件仍只接管 DSH 进程内的 undici fetch。
+
+## 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/README.md

@@ -328,6 +328,18 @@ v0.2.0 提供两个入口，互不替代：
 | 状态一直 `degraded` + `route-install-failed` | 查日志里的模块解析诊断；必要时确认 DSH 安装目录结构 |
 | `xray_switch_node` 报 `unknown service ... RoutingService` | xray 版本早于 2024-09；升级二进制，或关闭 `control.enabled` 只用 `activeNode` |
 
+## 内置浏览器（Chromium）
+
+DSH 内置浏览器走 Chromium 网络栈，不读 undici dispatcher，插件无法在运行时改它的代理。支持方式只有启动参数：
+
+```powershell
+& "E:\DS\DeepSeek Harness.exe" --proxy-server=http://127.0.0.1:20808
+```
+
+或运行 `tools/launch-with-browser-proxy.cmd`（自动查找 DSH 路径并透传 `--proxy-server`）。
+
+**必须先完全退出 DSH**：单实例再次启动只会聚焦旧窗口，不会应用参数。系统代理/TUN（v2rayN）也能让 Chromium 生效，但那是全机代理，与本插件无关。
+
 ## 开发
 
 ```powershell

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/lib/client.js

@@ -7,6 +7,8 @@ window.__ModuleLoader__.load({
     const PANEL_ID = 'xray'
     const NS = 'xray-proxy'
     const inject = ['slots']
+    const BROWSER_HINT =
+      '内置浏览器走 Chromium 网络栈，不受插件 dispatcher 影响：请用插件目录 tools/launch-with-browser-proxy.cmd 启动 DSH，或在快捷方式目标后追加 --proxy-server=http://127.0.0.1:20808（需完全退出 DSH 后重启才生效）。'
 
     const C = {
       page: { maxWidth: 980, margin: '0 auto', padding: '20px 24px 16px', color: 'var(--dsw-alias-label-primary, #0f1115)' },
@@ -463,7 +465,8 @@ window.__ModuleLoader__.load({
       }
       return h('div', { style: { ...C.card, marginTop: 8 } },
         h('div', { style: C.cardHead }, h(GlobeIcon), '2Xray 连接'),
-        h(XrayConfigForm, { pageForm: form }))
+        h(XrayConfigForm, { pageForm: form }),
+        h('p', { style: { ...C.muted, fontSize: 12, marginTop: 10 } }, BROWSER_HINT))
     }
 
     function SettingsSection({ controller }) {
@@ -473,7 +476,8 @@ window.__ModuleLoader__.load({
           h('div', null,
             h('h1', { style: C.title }, '2Xray'),
             h('p', { style: C.sub }, '导入 VLESS 链接或本地二维码，保存后重启 DSH 生效。'))),
-        h('section', { style: C.card }, h(XrayConfigForm, { controller })))
+        h('section', { style: C.card }, h(XrayConfigForm, { controller })),
+        h('p', { style: { ...C.muted, fontSize: 12, marginTop: 4 } }, BROWSER_HINT))
     }
 
     function apply(ctx) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twinsearth/dsh-2xray",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "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/scripts/release-check.mjs

@@ -73,7 +73,8 @@ const files = walk(ROOT)
 const outside = files.filter((file) => !isAllowed(file))
 check('every packaged file is allow-listed', outside.length === 0, outside.join(', ') || `${files.length} files`)
 
-for (const required of ['index.js', 'package.json', 'cordis.patch.yml', 'README.md', 'CHANGELOG.md', 'LICENSE', 'lib/supervisor.js', 'lib/control/grpc.js', 'locale/en.json', 'locale/zh.json', 'icon.svg']) {
+for (const required of ['index.js', 'package.json', 'cordis.patch.yml', 'README.md', 'CHANGELOG.md', 'LICENSE', 'lib/supervisor.js', 'lib/control/grpc.js',
+  'tools/launch-with-browser-proxy.cmd', 'locale/en.json', 'locale/zh.json', 'icon.svg']) {
   check(`required file ${required}`, files.includes(required))
 }
 

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 })
+  }
+})

package/tools/launch-with-browser-proxy.cmd

@@ -0,0 +1,30 @@
+@echo off
+setlocal
+rem Launch DeepSeek Harness with the embedded Chromium browser pointed at the
+rem plugin's local HTTP inbound. A Node plugin cannot change Chromium's proxy at
+rem runtime, so the switch has to be present when the app starts.
+rem
+rem Usage:
+rem   launch-with-browser-proxy.cmd ["C:\path\to\DeepSeek Harness.exe"]
+rem
+rem Close DSH completely before running this: a second launch only focuses the
+rem existing single instance and never applies the flag.
+
+set "PORT=20808"
+set "EXE=%~1"
+if not defined EXE set "EXE=%DSH_EXE%"
+
+if not defined EXE if exist "%LOCALAPPDATA%\Programs\DeepSeek Harness\DeepSeek Harness.exe" set "EXE=%LOCALAPPDATA%\Programs\DeepSeek Harness\DeepSeek Harness.exe"
+if not defined EXE if exist "%ProgramFiles%\DeepSeek Harness\DeepSeek Harness.exe" set "EXE=%ProgramFiles%\DeepSeek Harness\DeepSeek Harness.exe"
+if not defined EXE if exist "E:\DS\DeepSeek Harness.exe" set "EXE=E:\DS\DeepSeek Harness.exe"
+
+if not defined EXE (
+  echo DeepSeek Harness executable not found.
+  echo Pass the path explicitly:
+  echo   %~nx0 "C:\path\to\DeepSeek Harness.exe"
+  exit /b 1
+)
+
+echo Launching with embedded browser proxy: http://127.0.0.1:%PORT%
+start "" "%EXE%" --proxy-server=http://127.0.0.1:%PORT%
+endlocal