@yanglaofish/dsh-proxy-pro 1.0.0 → 1.0.2

package/docs/SPEC.md

@@ -65,7 +65,7 @@
 | NFR-3 | 可回滚 | 切回原插件只需恢复 cordis.patch.yml 一行 + 保留 `.bak` |
 | NFR-4 | 单一 dispatcher 主人 | 与 dsh-plugin-proxy 二选一启用，不同时 |
 | NFR-5 | 无新增第三方依赖 | 纯 ESM + 现有 DSH 包；逻辑层（proxy-core.js）零依赖可单测 |
-| NFR-6 | 双 profile 部署 | web + obsidian-web 都要装 |
+| NFR-6 | 双 profile 部署 | web + test 都要装 |
 
 ---
 
@@ -321,7 +321,7 @@ systemPollMs: 30000
 3. 重启 DSH → `proxy_status` 确认 active=true、url=proxyhk → 手动 web_fetch
    一个被墙 URL（如 github）确认 200。
 4. 验证 proxy_test github=PROXIED / deepseek=DIRECT。
-5. 再对 obsidian-web profile 做同样操作，重复验证。
+5. 再对 test profile 做同样操作，重复验证。
 6. 回滚 = 恢复原插件行 enabled（settings.yaml 没动过，天然安全），或
    `dsh plugin --profile web remove @yanglaofish/dsh-proxy-pro`。
 
@@ -378,4 +378,4 @@ _运行时快照（2026-09-17，⚠️ 尚未重启）：`/dsh-proxy-pro/api/sta
 5. ✅ 已装入两 profile + `--dump-config` 预检通过（两个组合树都含 dsh-proxy-pro 行）；
    ⏳ 待用户重启（当前**尚未重启**，403 为应用安全门、非插件响应）
 6. ⏳ GUI 确认 A1/A2（头部胶囊 + 设置页「代理管理」）→ 运行时验收 A3-A9
-   → obsidian-web A10 → 发布收尾
+   → test A10 → 发布收尾

package/lib/client.js

@@ -18,9 +18,15 @@
  * This hand-written module mirrors the loader format the in-repo client
  * bundles emit (window.__ModuleLoader__.load with a CommonJS factory): react
  * is required through the app's module table, no JSX, no bundler, no TS.
+ *
+ * The registration id MUST be the PACKAGE name: dsh-client-modules stores the
+ * factory under stripClientSuffix(id) and later looks it up by the graph row
+ * id (= package name). Registering "dsh-proxy-pro/client" (the pre-scope name)
+ * throws 'bundle ... loaded without registering "@yanglaofish/dsh-proxy-pro"
+ * via __ModuleLoader__.load' (see docs/LESSONS.md §18).
  */
 window.__ModuleLoader__.load({
-  id: "dsh-proxy-pro/client",
+  id: "@yanglaofish/dsh-proxy-pro",
   factory: (require) => {
     var module = { exports: {} };
     var exports = module.exports;

package/lib/index.js

@@ -31,6 +31,7 @@ import { installProxyFromEnvironment, proxyRouteFor } from '@deepseek-ai/dsh-htt
 import { execFile } from 'node:child_process'
 import { promisify } from 'node:util'
 import {
+  classifyTargetFailure,
   keepaliveHint,
   makeSystemProxyReader,
   normalizeProxyUrl,
@@ -149,18 +150,8 @@ function renderStatusText(snapshot) {
   ].join('\n')
 }
 
-/** Isolate NetworkError-ish codes that mean "could not connect at all". */
-function classifyTargetFailure(error) {
-  const cause = error?.cause
-  const code = cause?.code ?? error?.code ?? ''
-  if (code === 'EACCES' || code === 'ENETUNREACH' || code === 'EHOSTUNREACH' || code === 'ENOTFOUND' || code === 'ECONNREFUSED' || code === 'ETIMEDOUT') {
-    return { ok: false, kind: 'unreachable', short: `cannot reach directly (${code}) — needs a proxy route` }
-  }
-  if (/407|NTLM|authentication required/i.test(String(error?.message ?? ''))) {
-    return { ok: false, kind: 'auth', short: 'the proxy asks for NTLM authentication' }
-  }
-  return { ok: false, kind: 'other', short: (error?.message ?? String(error)).slice(0, 120) }
-}
+// classifyTargetFailure lives in proxy-core.js (pure logic, unit-tested) so the
+// panel's verdict can name the undici cause instead of a bare "fetch failed".
 
 // Forced-channel probing uses undici directly. Load lazily and never let a
 // resolution failure block boot (LESSONS §14: boot must not depend on a new
@@ -195,7 +186,13 @@ async function forceChannelProbe(url, channel, proxyUrl) {
   const controller = new AbortController()
   const timer = setTimeout(() => controller.abort(), 6000)
   try {
-    const res = await fetch(url, {
+    // MUST issue the request with THIS undici copy. The host runs two copies —
+    // Node's built-in `fetch` and the app's `undici` package — and a dispatcher
+    // built by one handed to the other rejects with UND_ERR_INVALID_ARG
+    // ("invalid onRequestStart method"); the panel rendered that as a bare
+    // "fetch failed" for BOTH forced channels (LESSONS §22). und.fetch and the
+    // Agent/ProxyAgent above come from the same import, so they always agree.
+    const res = await und.fetch(url, {
       method: 'HEAD',
       redirect: 'manual',
       signal: controller.signal,

package/lib/proxy-core.js

@@ -266,3 +266,35 @@ export function keepaliveHint(message = '', proxyUrl = '') {
   const example = typeof proxyUrl === 'string' && proxyUrl !== '' ? proxyUrl : 'http://localhost:7890'
   return `This proxy asks for NTLM authentication, which undici cannot negotiate by itself. A recent curl/browser connection to the same proxy keeps an authenticated window open — run a \`curl\` through the proxy (e.g. \`curl -x ${example} -I https://github.com\`) once, then retry.`
 }
+
+/**
+ * Turn a fetch rejection into a short, actionable verdict for the panel and the
+ * `proxy_test` tool.
+ *
+ * A bare `fetch failed` hides the real cause. The host runs TWO undici copies —
+ * Node's built-in `fetch` and the app's `undici` package — and a dispatcher
+ * built by one handed to the other rejects with UND_ERR_INVALID_ARG ("invalid
+ * onRequestStart method"); that is exactly how the forced-channel diagnostic
+ * failed (LESSONS §22). Surface the cause code so the next report names it.
+ *
+ * @param error - the rejection from `fetch`.
+ * @returns `{ ok: false, kind, short }` with a cause-aware message.
+ */
+export function classifyTargetFailure(error) {
+  const cause = error?.cause
+  const code = cause?.code ?? error?.code ?? ''
+  if (code === 'EACCES' || code === 'ENETUNREACH' || code === 'EHOSTUNREACH' || code === 'ENOTFOUND' || code === 'ECONNREFUSED' || code === 'ETIMEDOUT') {
+    return { ok: false, kind: 'unreachable', short: `cannot reach directly (${code}) — needs a proxy route` }
+  }
+  if (code === 'UND_ERR_INVALID_ARG' || /invalid onRequestStart/i.test(String(cause?.message ?? ''))) {
+    return { ok: false, kind: 'dispatcher', short: `dispatcher rejected by this undici instance (${code || 'UND_ERR_INVALID_ARG'}) — mixed undici copies` }
+  }
+  if (/407|NTLM|authentication required/i.test(String(error?.message ?? ''))) {
+    return { ok: false, kind: 'auth', short: 'the proxy asks for NTLM authentication' }
+  }
+  const detail = cause?.code
+    ? `${cause.code}${cause?.message ? `: ${String(cause.message).slice(0, 90)}` : ''}`
+    : (cause?.message ?? '')
+  const base = String(error?.message ?? error)
+  return { ok: false, kind: 'other', short: (detail ? `${base} (${detail})` : base).slice(0, 180) }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yanglaofish/dsh-proxy-pro",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "DSH proxy manager: route model requests, web fetches and spawned tools through the Windows system proxy or a custom address; per-URL route diagnosis, one-click toggle from the conversation header, a dedicated Settings page, and keepalive-aware 407 hints.",
   "type": "module",
   "main": "./lib/index.js",