dsh-pocket 1.0.25 → 1.0.26

package/README.en.md

@@ -129,7 +129,7 @@ Such tools take over all traffic and often cut cloudflared's tunnel-edge connect
 | `lib/service.mjs` | Service: proxy lifecycle, public tunnel, status snapshot (with QR data URLs) |
 | `lib/proxy.mjs` | Header-rewriting reverse proxy: Host/Origin → loopback, HTTP + WebSocket passthrough + polyfill injection |
 | `lib/tunnel.mjs` | cloudflared quick tunnel: download/extract/start/parse public URL (HTTP/2) |
-| `lib/web-rpc.js` | Loopback RPC: `pocket.status` / `tunnel.start` / `tunnel.stop` |
+| `lib/web-rpc.js` | Loopback RPC: `status` / `tunnel.start` / `tunnel.stop` / `version` / `update` / `restart` |
 | `client/` | "Phone access" settings tab + mobile adaptation (dsh-web-mobile port) |
 | `bin/dsh-pocket.mjs` | CLI: LAN/public modes, prints URL + QR |
 

package/README.md

@@ -130,7 +130,7 @@ npx @deepseek-ai/dsh web
 | `lib/service.mjs` | 服务：代理生命周期、公网隧道、状态快照（含二维码 data URL） |
 | `lib/proxy.mjs` | 改头反向代理：Host/Origin → loopback，HTTP + WebSocket 全透传 + polyfill 注入 |
 | `lib/tunnel.mjs` | cloudflared 快速隧道：下载/解压/启动/解析公网 URL（HTTP/2） |
-| `lib/web-rpc.js` | loopback RPC：`pocket.status` / `tunnel.start` / `tunnel.stop` |
+| `lib/web-rpc.js` | loopback RPC：`status` / `tunnel.start` / `tunnel.stop` / `version` / `update` / `restart` |
 | `client/` | 设置页「手机访问」+ 移动端适配（dsh-web-mobile 移植） |
 | `bin/dsh-pocket.mjs` | CLI：局域网/公网模式，打印 URL + 二维码 |
 

package/client/api.js

@@ -19,13 +19,29 @@ export function compareVersions(a, b) {
     const y = parseInt(pb[i], 10) || 0;
     if (x !== y) return x - y;
   }
-  // 数字段相等：无预发布后缀的更新；都有后缀时按后缀字典序（alpha < beta < rc…）
+  // 数字段相等：无预发布后缀的更新；都有后缀时按段比较（alpha < beta < rc…，
+  // 数字段按数值：rc.9 < rc.10）
   const aPre = String(a).replace(/^[vV]/, '').match(/-.*$/)?.[0] ?? '';
   const bPre = String(b).replace(/^[vV]/, '').match(/-.*$/)?.[0] ?? '';
   if (!aPre && !bPre) return 0;
   if (!aPre) return 1;
   if (!bPre) return -1;
-  return aPre < bPre ? -1 : aPre > bPre ? 1 : 0;
+  // 逐段比较：数字段按数值、文本段按字典序
+  const aParts = aPre.slice(1).split('.');
+  const bParts = bPre.slice(1).split('.');
+  const len = Math.max(aParts.length, bParts.length);
+  for (let i = 0; i < len; i++) {
+    const ax = aParts[i] ?? '';
+    const bx = bParts[i] ?? '';
+    if (ax === bx) continue;
+    const aNum = /^\d+$/.test(ax);
+    const bNum = /^\d+$/.test(bx);
+    if (aNum && bNum) return Number(ax) - Number(bx); // 数值比较
+    if (aNum) return 1; // 数字段 > 文本段
+    if (bNum) return -1;
+    return ax < bx ? -1 : 1; // 字典序
+  }
+  return 0;
 }
 
 /** 浏览器可见的状态字段（无敏感信息；含二维码 data URL）。 */

package/client/build.mjs

@@ -29,6 +29,13 @@ const wrapped = `window.__ModuleLoader__.load({
   factory: (require) => {
     var module = { exports: {} };
     var exports = module.exports;
+    // The DSH client module system provides react as a module, never as a
+    // global. esbuild keeps react external (see the build config above) and
+    // its classic JSX transform emits bare React.createElement calls for the
+    // mobile components (which import only named hooks, not React itself), so
+    // the bundle must bind React itself - otherwise every mobile component
+    // crashes at render time with "ReferenceError: React is not defined".
+    var React = require("react");
 ${bundled}
     return module.exports;
   }

package/client/client.js

@@ -3,6 +3,13 @@ window.__ModuleLoader__.load({
   factory: (require) => {
     var module = { exports: {} };
     var exports = module.exports;
+    // The DSH client module system provides react as a module, never as a
+    // global. esbuild keeps react external (see the build config above) and
+    // its classic JSX transform emits bare React.createElement calls for the
+    // mobile components (which import only named hooks, not React itself), so
+    // the bundle must bind React itself - otherwise every mobile component
+    // crashes at render time with "ReferenceError: React is not defined".
+    var React = require("react");
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;

package/lib/proxy.mjs

@@ -84,8 +84,11 @@ export function createPocketProxy({ port = 3081, host = '0.0.0.0', upstream = DE
         }
         res.writeHead(proxyRes.statusCode ?? 502, proxyRes.headers);
         proxyRes.pipe(res);
-        // 客户端断开时销毁上游响应（SSE 流手机断连后不留僵尸连接）
+        // 任一端断开都要清理另一端：客户端断连销毁上游流（不留僵尸），
+        // 上游流中途断开也要掐断客户端（否则响应头已发、体没发完 → 悬挂）
         res.on('close', () => proxyRes.destroy());
+        proxyRes.on('error', () => res.destroy());
+        proxyRes.on('close', () => { if (!res.writableEnded) res.destroy(); });
       },
     );
     proxyReq.on('error', (err) => {
@@ -125,10 +128,10 @@ export function createPocketProxy({ port = 3081, host = '0.0.0.0', upstream = DE
         for (const [k, v] of Object.entries(proxyRes.headers)) {
           raw.push(`${k}: ${Array.isArray(v) ? v.join(', ') : v}`);
         }
+        // end 会 flush 响应头再 FIN——不要紧跟 destroy()，否则排队的头会被丢弃
         socket.end(raw.join('\r\n') + '\r\n\r\n');
         proxyRes.resume(); // 消费掉上游响应体，释放连接
-      } catch { /* socket 已关 */ }
-      socket.destroy();
+      } catch { socket.destroy(); }
     });
     proxyReq.on('error', () => socket.destroy());
     // 关键：浏览器在握手请求后可能立即发出首帧（如 mux 流的初始 RPC），
@@ -140,6 +143,15 @@ export function createPocketProxy({ port = 3081, host = '0.0.0.0', upstream = DE
     socket.on('error', () => socket.destroy());
   });
 
+  // 跟踪所有 TCP 连接（含 WebSocket upgrade 后的 socket——Node 的
+  // closeAllConnections 不包含它们，不手动销毁 close() 会永远等）
+  const clientSockets = new Set();
+  server.on('connection', (sock) => {
+    clientSockets.add(sock);
+    sock.on('close', () => clientSockets.delete(sock));
+    sock.on('error', () => {}); // 防未处理 error 崩进程
+  });
+
   return new Promise((resolve, reject) => {
     server.once('error', reject);
     server.listen(port, host, () => {
@@ -147,7 +159,10 @@ export function createPocketProxy({ port = 3081, host = '0.0.0.0', upstream = DE
       resolve({
         server,
         port: actualPort,
-        close: () => new Promise((r) => server.close(() => r())),
+        close: () => new Promise((r) => {
+          for (const s of clientSockets) { try { s.destroy(); } catch { /* 忽略 */ } }
+          server.close(() => r());
+        }),
       });
     });
   });

package/lib/restart.js

@@ -15,12 +15,16 @@ import { spawn } from 'node:child_process';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 
-/** 从启动参数里解析 dsh web 端口（--port/-p），默认 3080。 */
+/** 从启动参数里解析 dsh web 端口（--port/-p，含 --port=3080 形式），默认 3080。 */
 export function dshPortFromArgs(args) {
   for (let i = 0; i < args.length; i++) {
-    if ((args[i] === '--port' || args[i] === '-p') && args[i + 1]) {
+    const a = args[i];
+    if (a === '--port' || a === '-p') {
       const n = Number(args[i + 1]);
       if (Number.isInteger(n) && n > 0 && n < 65536) return n;
+    } else if (a.startsWith('--port=')) {
+      const n = Number(a.slice('--port='.length));
+      if (Number.isInteger(n) && n > 0 && n < 65536) return n;
     }
   }
   return 3080;
@@ -57,7 +61,7 @@ function helperCode(launch, logOut, logErr, port) {
     '    else setTimeout(() => waitPort(p, tries - 1, cb), 200)',
     '  })',
     '}',
-    `waitPort(${port}, 100, (free) => {`, // 最多 100×200ms = 20s
+    `waitPort(${port}, 100, (free) => {`, // 最多 100×200ms = 20s；超时也照常拉起（宁可试拉、日志留痕，也不让 dsh 起不来）
     '  setTimeout(() => {',
     '    try {',
     '      const out = fs.openSync(logOut, "a")',

package/package.json

@@ -76,5 +76,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "version": "1.0.25"
+  "version": "1.0.26"
 }