@having5548/dsh-downloader 0.5.2 → 0.5.3

package/CHANGELOG.md

@@ -9,6 +9,31 @@
 
 ## [未发布]
 
+## [0.5.3] - 2026-10-11
+
+### 修复
+
+- **上游断管会把整个 DSH 宿主崩掉**（严重，宿主连续崩了两次）。
+  现象：`crash-2026-10-11T03-46-46-081Z-host.log` 与 `03-48-03-999Z-host.log` 的栈指向同一处：
+  ```
+  dsh: fatal uncaught exception: Error: write EPIPE
+      at Writable.write (node:internal/streams/writable:508:10)
+      at Object.write (.../@having5548/dsh-downloader/lib/core/transports.js:598:28)
+      at Socket.<anonymous> (.../@having5548/dsh-downloader/lib/core/proxy-server.js:154:9)
+  ```
+  根因：`nativeConnect()` 用 `stdio: ["pipe","pipe","pipe"]` 起 Go 连接器，但**三根管道一个 `error` 监听都没挂**。
+  连接器进程一死（连接失败 / 超时 / 被 kill），管道随即断裂，之后任何一次写入都会让 `child.stdin` 抛出
+  `EPIPE` —— 而在 Node 里**没有监听者的 `error` 事件就是未捕获异常**，直接把宿主带走。
+  原有的 `ended` 标志挡不住这个竞态：写入可能排在一个已经断掉的管道上，而 `exit` 事件还没派发。
+  修法（三层）：
+  1. 新增 `stdioFace(child)`：给 `stdin` / `stdout` / `stderr` 与子进程本身都挂 `error` 监听，
+     写入再包一层 try/catch（防同步抛出），并保留连接器最后的 stderr 供排查；
+  2. `ProxyServer.#relay()` 里的 `face.write(chunk)` 包 try/catch，失败即关闭上游并销毁客户端连接；
+  3. 新增**独立子进程**回归测试：让子进程关掉 stdin 但继续活着（于是 `ended` 不会置位、管道却已断），
+     再灌 1.25 MB 数据。旧写法在该探针下必崩（实测 `exit=1`、`code: 'EOF'`），修复后存活。
+
+> 测试 366 → 368 项。
+
 ## [0.5.2] - 2026-10-10
 
 两处都是把 `dsh_run_proxied` 真正用起来时才暴露的：`git push` 打插件内核**必定**失败。

package/README.en.md

@@ -6,10 +6,11 @@
 
 [简体中文](README.md) | English
 
-![Version](https://img.shields.io/badge/version-0.5.2-4c7ef3?style=flat-square)
+![Version](https://img.shields.io/badge/version-0.5.3-4c7ef3?style=flat-square)
+![npm](https://img.shields.io/npm/v/@having5548/dsh-downloader?style=flat-square&label=npm)
 ![Platform](https://img.shields.io/badge/platform-Windows%20%7C%20macOS%20%7C%20Linux-0078d6?style=flat-square)
 ![Protocols](https://img.shields.io/badge/nodes-ss%20%7C%20trojan%20%7C%20vless%20%7C%20vmess%20%7C%20socks5%20%7C%20http-2b6cb0?style=flat-square)
-![Tests](https://img.shields.io/badge/tests-366%20passed-2fa95e?style=flat-square)
+![Tests](https://img.shields.io/badge/tests-368%20passed-2fa95e?style=flat-square)
 ![License](https://img.shields.io/badge/license-MIT-green?style=flat-square)
 
 </div>
@@ -50,20 +51,27 @@ The two can be used together; they do not interfere. This plugin **never mutates
 
 ## 📦 Install
 
+From npm (published to the official registry):
+
+```bash
+dsh plugin --profile desktop add @having5548/dsh-downloader
+```
+
 From the GitHub release:
 
 ```bash
-dsh plugin --profile desktop add https://github.com/having5548/dsh-downloader/releases/latest/download/having5548-dsh-downloader-0.5.2.tgz
+dsh plugin --profile desktop add https://github.com/having5548/dsh-downloader/releases/latest/download/having5548-dsh-downloader-0.5.3.tgz
 ```
 
 Or build and install locally:
 
 ```bash
 npm pack
-dsh plugin --profile desktop add having5548-dsh-downloader-0.5.2.tgz
+dsh plugin --profile desktop add having5548-dsh-downloader-0.5.3.tgz
 ```
 
 > Profile name: the current Electron desktop app uses `desktop`; the older web CLI used `web`.
+> The README shown on the npm page is the one captured **at publish time** — later documentation edits only reach it with the next release.
 
 Then open **Settings → Download proxy**.
 
@@ -257,7 +265,7 @@ The upstream is resolved in this order; the first hit wins:
 | `downloadDir` | empty | empty = `$DSH_HOME/downloads` |
 | `maxDownloadMb` | `512` | per-file size limit |
 | `downloadTimeoutS` | `600` | per-download wall-clock budget |
-| `threads` | `4` | segmented connection count; `1` = single stream. Falls back to one connection when the server lacks `Range`, answers it dishonestly, or the file is under 1 MiB |
+| `threads` | `4` | segmented connection count; `1` = single stream. Falls back to one connection when the server lacks `Range`, answers it dishonestly, or the file is under 1 MiB |
 | `stallTimeoutS` | `30` | abort after this long with no data |
 | `insecureTls` | `false` | skip TLS verification (corporate TLS interception only) |
 | `allowOutsideWorkspace` | `false` | allow `save_path` outside the workspace and download directory |
@@ -351,7 +359,7 @@ The core (rule engine, CN data, loopback mixed proxy, node transports, subscript
 
 ```bash
 npm install
-node test/smoke.mjs      # 366 checks: rules / subscriptions / profile import / routing / HTTP client / end-to-end / session guard / token gate
+node test/smoke.mjs      # 368 checks: rules / subscriptions / profile import / routing / HTTP client / end-to-end / session guard / token gate
 node --check lib/client.js
 npm pack
 ```

package/README.md

@@ -6,10 +6,11 @@
 
 简体中文 | [English](README.en.md)
 
-![Version](https://img.shields.io/badge/version-0.5.2-4c7ef3?style=flat-square)
+![Version](https://img.shields.io/badge/version-0.5.3-4c7ef3?style=flat-square)
+![npm](https://img.shields.io/npm/v/@having5548/dsh-downloader?style=flat-square&label=npm)
 ![Platform](https://img.shields.io/badge/platform-Windows%20%7C%20macOS%20%7C%20Linux-0078d6?style=flat-square)
 ![Protocols](https://img.shields.io/badge/nodes-ss%20%7C%20trojan%20%7C%20vless%20%7C%20vmess%20%7C%20socks5%20%7C%20http-2b6cb0?style=flat-square)
-![Tests](https://img.shields.io/badge/tests-366%20passed-2fa95e?style=flat-square)
+![Tests](https://img.shields.io/badge/tests-368%20passed-2fa95e?style=flat-square)
 ![License](https://img.shields.io/badge/license-MIT-green?style=flat-square)
 
 </div>
@@ -50,20 +51,27 @@ NO_PROXY=localhost,127.0.0.1,::1,deepseek.com,.deepseek.com
 
 ## 📦 安装
 
+从 npm 安装（已发布到官方源）：
+
+```bash
+dsh plugin --profile desktop add @having5548/dsh-downloader
+```
+
 从 GitHub Release 安装：
 
 ```bash
-dsh plugin --profile desktop add https://github.com/having5548/dsh-downloader/releases/latest/download/having5548-dsh-downloader-0.5.2.tgz
+dsh plugin --profile desktop add https://github.com/having5548/dsh-downloader/releases/latest/download/having5548-dsh-downloader-0.5.3.tgz
 ```
 
 本地打包安装：
 
 ```bash
 npm pack
-dsh plugin --profile desktop add having5548-dsh-downloader-0.5.2.tgz
+dsh plugin --profile desktop add having5548-dsh-downloader-0.5.3.tgz
 ```
 
 > profile 名：新版桌面端是 `desktop`，旧版 Web 端是 `web`。
+> npm 页面上显示的 README 是**发布那一刻**的版本 —— 后来改的文档要等下一次发版才会同步过去。
 
 装完打开 **设置 → 下载代理**。
 
@@ -356,7 +364,7 @@ dsh_run_proxied({ command: "git clone https://github.com/x/y.git" })
 
 ```bash
 npm install
-node test/smoke.mjs      # 366 项：规则引擎 / 订阅解析 / 配置导入 / 路由 / HTTP 客户端 / 端到端下载 / 会话守卫 / 令牌鉴权
+node test/smoke.mjs      # 368 项：规则引擎 / 订阅解析 / 配置导入 / 路由 / HTTP 客户端 / 端到端下载 / 会话守卫 / 令牌鉴权
 node --check lib/client.js
 npm pack
 ```

package/lib/core/proxy-server.js

@@ -151,7 +151,14 @@ export class ProxyServer {
 		}).catch(() => client.destroy());
 		client.on("data", (chunk) => {
 			this.counters.up += chunk.length;
-			face.write(chunk);
+			// [dsh-downloader] 上游可能已经断了（连接器进程退出、socket 被销毁）。
+			// 写入必须兜住：让它抛出去就是未捕获异常，会崩掉整个宿主进程。
+			try {
+				face.write(chunk);
+			} catch {
+				try { face.close(); } catch { /* already gone */ }
+				client.destroy();
+			}
 		});
 		client.on("end", () => face.close());
 		client.on("close", () => face.close());

package/lib/core/transports.js

@@ -552,6 +552,60 @@ export function hasNativeConnector() {
 	try { return existsSync(CONNECTOR_PATH); } catch { return false; }
 }
 
+/**
+ * Wrap a spawned connector's stdio as a duplex face.
+ *
+ * [dsh-downloader] 这三根管道**必须**在第一时间挂上 `error` 监听。连接器进程一死，
+ * 管道就断了，之后任何一次 `write` 都会让 `child.stdin` 抛出 `EPIPE`；而在 Node 里
+ * **没有监听者的 `error` 事件是未捕获异常**，会直接把宿主进程带走 ——
+ * 实测把 DSH 宿主崩掉两次（crash-2026-10-11T03-46 / 03-48，栈就落在下面这行 write）。
+ *
+ * 另外 `ended` 标志挡不住这个竞态：`write` 可能排在一个已经断掉的管道上，
+ * 而 `exit` 事件还没派发。所以写入本身也要兜住。
+ *
+ * 导出只为测试：生产路径只有 `nativeConnect` 调用它。
+ */
+export function stdioFace(child) {
+	let ended = false;
+	let stderrTail = "";
+	const markEnded = () => {
+		ended = true;
+	};
+
+	child.stdin.on("error", markEnded);
+	child.stdout.on("error", markEnded);
+	child.stderr.on("error", markEnded);
+	child.on("error", markEnded);
+	child.on("exit", markEnded);
+	child.stderr.on("data", (chunk) => {
+		stderrTail = (stderrTail + chunk.toString()).slice(-512);
+	});
+
+	return {
+		read: (async function* () {
+			for await (const chunk of child.stdout) {
+				yield chunk;
+			}
+		})(),
+		write: (data) => {
+			if (ended) return;
+			try {
+				child.stdin.write(data);
+			} catch {
+				// 管道已断（连接器已退出）：丢掉这一块，绝不让它冒泡成未捕获异常。
+				ended = true;
+			}
+		},
+		close: () => {
+			try { child.stdin.end(); } catch { /* already closed */ }
+			try { child.stdout.destroy(); } catch { /* already closed */ }
+			if (!ended) setTimeout(() => child.kill(), 500);
+		},
+		/** 连接器最后的 stderr，排查「节点为什么连不上」时有用。 */
+		stderrTail: () => stderrTail
+	};
+}
+
 /**
  * Connect through the self-compiled Go connector via stdio: stdin feeds the
  * remote target, stdout carries the reply. Supports `hysteria2` and `reality`.
@@ -581,28 +635,7 @@ function nativeConnect(proto, node, host, port) {
 		stdio: ["pipe", "pipe", "pipe"],
 		windowsHide: true
 	});
-	let ended = false;
-	let stderrTail = "";
-	child.stderr.on("data", (chunk) => {
-		stderrTail = (stderrTail + chunk.toString()).slice(-512);
-	});
-	child.on("exit", () => { ended = true; });
-
-	return {
-		read: (async function* () {
-			for await (const chunk of child.stdout) {
-				yield chunk;
-			}
-		})(),
-		write: (data) => {
-			if (!ended) child.stdin.write(data);
-		},
-		close: () => {
-			try { child.stdin.end(); } catch { /* already closed */ }
-			try { child.stdout.destroy(); } catch { /* already closed */ }
-			if (!ended) setTimeout(() => child.kill(), 500);
-		}
-	};
+	return stdioFace(child);
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@having5548/dsh-downloader",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "DeepSeek Harness 下载代理插件：注册 dsh_download 等工具，让模型下载境外文件时自动走插件自带的代理内核（订阅自包含，或显式 proxyUrl），境内直连；带 sha256、大小上限、停滞检测与直连失败自动回退，另附「设置 → 下载代理」管理面板。",
   "keywords": [
     "dsh",
@@ -83,6 +83,7 @@
   },
   "license": "MIT",
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "registry": "https://registry.npmjs.org"
   }
 }