dsh-rss 0.6.1 → 0.6.2

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # 更新记录
 
+## 0.6.2 (2026-10-15)
+
+- 加固直连、HTTP CONNECT 与 TLS 握手的套接字错误隔离，抓取结束会销毁本次请求仍持有的连接，避免错误在请求结束后逃逸。
+- 更新 Undici 至 8.12.1；新增独立进程的直连失败、代理 TLS 失败和超时取消回归检查。
+
 [返回简介](README.md) · [使用说明](docs/USAGE.md) · [验证记录](docs/VALIDATION.md)
 
 [历史英文记录](docs/CHANGELOG.en.md)

package/README.en.md

@@ -8,6 +8,8 @@ Subscribe to and read RSS or Atom feeds, and manage updates from DSH.
 
 [![npm](https://img.shields.io/npm/v/dsh-rss)](https://www.npmjs.com/package/dsh-rss) [![downloads](https://raw.githubusercontent.com/STARDUSTLC666/dsh-suite/npm-downloads/assets/dsh-rss-downloads.svg)](https://www.npmjs.com/package/dsh-rss)
 
+Feedback and contributions are welcome: report [issues](https://github.com/STARDUSTLC666/dsh-rss/issues) or submit [pull requests](https://github.com/STARDUSTLC666/dsh-rss/pulls).
+
 ## What it does
 
 - Add feeds, read articles and fetch updates.

package/README.md

@@ -8,6 +8,8 @@
 
 [![npm](https://img.shields.io/npm/v/dsh-rss)](https://www.npmjs.com/package/dsh-rss) [![downloads](https://raw.githubusercontent.com/STARDUSTLC666/dsh-suite/npm-downloads/assets/dsh-rss-downloads.svg)](https://www.npmjs.com/package/dsh-rss)
 
+欢迎使用，遇到问题或有改进建议，请提交 [issues](https://github.com/STARDUSTLC666/dsh-rss/issues) 和 [PR](https://github.com/STARDUSTLC666/dsh-rss/pulls)。
+
 ## 功能
 
 - 添加订阅、查看文章和抓取更新。

package/lib/proxy-fetch.js

@@ -1,14 +1,39 @@
 /**
  * 插件级 HTTP 代理：给 RSS 抓取请求一个走指定代理的 fetch，不影响同进程其他插件。
  */
-import { Agent, Client, ProxyAgent, fetch as undiciFetch } from 'undici';
+import { Agent, Client, ProxyAgent, buildConnector, fetch as undiciFetch } from 'undici';
 import { isIP } from 'node:net';
 /** One request/redirect hop owns its dispatcher until its body has been read. */
 export function createFeedTransport(url, proxyUrl, addresses) {
     const hostname = url.hostname.replace(/^\[|\]$/g, '');
     const servername = isIP(hostname) === 0 ? hostname : undefined;
+    const sockets = new Set();
+    const onLateError = () => { };
+    function watch(socket) {
+        // CONNECT detaches the HTTP client's listeners before handing over its socket.
+        // Reattach after handover as well as immediately after socket construction.
+        if (!socket.listeners('error').includes(onLateError))
+            socket.on('error', onLateError);
+        if (!sockets.has(socket)) {
+            sockets.add(socket);
+            socket.once('close', () => sockets.delete(socket));
+        }
+        return socket;
+    }
+    function guarded(connect) {
+        return (options, callback) => {
+            const socket = connect(options, (error, connected) => {
+                if (error !== null)
+                    callback(error, null);
+                else
+                    callback(null, watch(connected));
+            });
+            if (socket !== undefined)
+                watch(socket);
+        };
+    }
     const dispatcher = proxyUrl === ''
-        ? new Agent({ connect: addresses === undefined ? {} : {
+        ? new Agent({ connect: guarded(buildConnector(addresses === undefined ? {} : {
                 lookup: (name, options, callback) => {
                     if (name !== hostname) {
                         callback(new Error('Unexpected RSS connection hostname'), '', 4);
@@ -24,23 +49,47 @@ export function createFeedTransport(url, proxyUrl, addresses) {
                     else
                         callback(null, candidates[0].address, candidates[0].family);
                 },
-            } })
+            })) })
         : new ProxyAgent({ uri: proxyUrl, proxyTunnel: true, requestTls: { servername },
+            clientFactory: (origin, rawOptions) => {
+                const options = rawOptions;
+                const connect = typeof options.connect === 'function' ? options.connect : buildConnector(options.connect ?? {});
+                return new Client(origin, { ...options, connect: guarded(connect) });
+            },
             factory: (origin, options) => {
                 const delegate = options.connect;
-                if (addresses === undefined || typeof delegate !== 'function')
-                    return new Client(origin, options);
+                if (typeof delegate !== 'function')
+                    throw new Error('RSS proxy did not supply a tunnel connector');
+                const endpoint = guarded(buildConnector({ servername }));
                 return new Client(origin, { ...options, connect: (socketOptions, callback) => {
-                        const address = addresses[0].address;
+                        const address = addresses?.[0]?.address ?? hostname;
                         const port = socketOptions.port || (url.protocol === 'https:' ? '443' : '80');
                         const host = (isIP(address) === 6 ? '[' + address + ']' : address) + ':' + port;
-                        delegate({ ...socketOptions, hostname: address, host, port, servername }, callback);
+                        // Ask ProxyAgent for a raw CONNECT tunnel, then own the TLS socket too.
+                        // A callback around the final TLS socket alone misses handshake errors.
+                        delegate({ ...socketOptions, protocol: 'http:', hostname: address, host, port, servername }, (error, tunnel) => {
+                            if (error !== null) {
+                                callback(error, null);
+                                return;
+                            }
+                            watch(tunnel);
+                            if (url.protocol !== 'https:') {
+                                callback(null, tunnel);
+                                return;
+                            }
+                            endpoint({ ...socketOptions, hostname: address, host, port, servername, httpSocket: tunnel }, callback);
+                        });
                     } });
             },
         });
     return {
         fetch: async (input, init) => await undiciFetch(input, { ...init, redirect: 'manual', dispatcher }),
-        dispose: async () => { await dispatcher.destroy(); },
+        dispose: async () => {
+            for (const socket of sockets)
+                socket.destroy();
+            await dispatcher.destroy();
+            sockets.clear();
+        },
     };
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-rss",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "订阅和阅读 RSS / Atom，在 DSH 中查看与管理更新。",
   "type": "module",
   "main": "lib/index.js",
@@ -55,7 +55,7 @@
     "@deepseek-ai/schemastery": "^3.18.3",
     "fast-xml-parser": "^5.0.0",
     "schemastery": "^3.18.0",
-    "undici": "^8.11.2",
+    "undici": "^8.12.1",
     "yaml": "^2.9.0"
   },
   "devDependencies": {