dsh-mesh-access 1.5.2 → 1.5.4

package/CHANGELOG.md

@@ -203,3 +203,15 @@
 
 - 告诉 AI 这套流程来自 DSH 插件 dsh-mesh-access（npm 包名 / GitHub 仓库 / 离线 tgz），
   操作结果在左侧「组网访问」面板查看，并指引优先读 docs/AI-SETUP.md。
+
+## 1.5.3 — 重启后自动恢复组网端口
+
+- start 成功后把端口记进侧车（meshPort）；手动 stop 会清除记录。
+- dsh web 启动时若侧车有记录，自动把组网口开回来（轮询等待上游端口与组网网卡就绪，
+  最多 5 分钟；期间用户手动开过就不再干预）。解决升级/重启后手机突然 502 的问题。
+
+## 1.5.4 — 面板可临时停用 billion-context
+
+- 新增「远程卡顿？临时停用 billion-context」卡片：一键写入/移除 profile 的
+  cordis.patch.yml 停用补丁（带标记，恢复时精确删除），并结束现存守护进程。
+- 适用场景：组网/远程连接卡顿时减负；重启 dsh web 后彻底不加载，随时可恢复。

package/lib/client.js

@@ -68,6 +68,8 @@ window.__ModuleLoader__.load({
       status: () => fetchJson('/api/dsh-mesh-access/status', {}, 6000),
       tunnel: () => fetchJson('/api/dsh-mesh-access/tunnel', {}, 8000),
       auth: () => fetchJson('/api/dsh-mesh-access/auth', {}, 8000),
+      perf: () => fetchJson('/api/dsh-mesh-access/perf', {}, 6000),
+      perfPost: (body) => fetchJson('/api/dsh-mesh-access/perf', { method: 'POST', body: JSON.stringify(body) }, 20000),
       authPost: (body) => fetchJson('/api/dsh-mesh-access/auth', { method: 'POST', body: JSON.stringify(body) }, 20000),
       tunnelAction: (action) =>
         fetchJson('/api/dsh-mesh-access/tunnel', {
@@ -103,6 +105,8 @@ window.__ModuleLoader__.load({
       const [authBusy, setAuthBusy] = react.useState(false)
       const [authErr, setAuthErr] = react.useState(null)
       const [authForm, setAuthForm] = react.useState({ username: '', password: '' })
+      const [perf, setPerf] = react.useState(null)
+      const [perfBusy, setPerfBusy] = react.useState(false)
       const [tab, setTab] = react.useState('guide')
       const [authMsg, setAuthMsg] = react.useState('')
       const [busy, setBusy] = react.useState(false)
@@ -129,6 +133,10 @@ window.__ModuleLoader__.load({
           .auth()
           .then((a) => setAuth(a))
           .catch(() => {})
+        api
+          .perf()
+          .then((pf) => setPerf(pf))
+          .catch(() => {})
       }, [])
 
       react.useEffect(() => {
@@ -152,6 +160,15 @@ window.__ModuleLoader__.load({
           .finally(() => setTunnelBusy(false))
       }
 
+      const runPerf = async (action) => {
+        setPerfBusy(true)
+        try {
+          const r = await api.perfPost({ action })
+          if (!r.ok) { window.alert(r.error || '操作失败'); return }
+          window.alert(r.note || '完成')
+          refresh()
+        } catch (e) { window.alert('操作失败：' + (e && e.message)) } finally { setPerfBusy(false) }
+      }
       const runConfig = () => {
         const payload = Object.assign({ action: 'config' }, form)
         setTunnelBusy(true)
@@ -529,6 +546,18 @@ window.__ModuleLoader__.load({
           })(),
         ),
         h(
+          Card, { title: '远程卡顿？临时停用 billion-context（可选）' },
+            h('div', { style: S.hint },
+              '组网/远程连接特别卡时，可临时停用 billion-context 插件（它会为每个会话开本地守护进程，远程场景下是纯开销）。停用后上下文压缩等会话功能不可用，远程更流畅。'),
+            perf ? h('div', { style: S.row },
+              h('span', { style: S.hint },
+                perf.bcDisabled ? '当前：已停用（重启 dsh web 后彻底不加载）' : ('当前：运行中' + (perf.bcDaemons ? '（守护 ' + perf.bcDaemons + ' 个）' : ''))),
+              perf.bcDisabled
+                ? h('button', { style: S.btn, disabled: perfBusy, onClick: () => runPerf('enable-bc') }, '恢复')
+                : h('button', { style: S.btnPrimary, disabled: perfBusy, onClick: () => { if (window.confirm('停用 billion-context？上下文压缩等会话功能将不可用，重启 dsh web 后彻底生效。')) runPerf('disable-bc') } }, '临时停用'),
+            ) : h('div', { style: S.hint }, '状态读取中…'),
+          ),
+          h(
           Card, { title: '第一次用星空组网？' },
           h('div', { style: S.hint }, '三步走，不用记 IP，也不用改任何配置。'),
           h('div', { style: S.row },

package/lib/index.js

@@ -17,9 +17,11 @@
  */
 import os from 'node:os'
 import fs from 'node:fs'
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+import { execSync } from 'node:child_process'
 import http from 'node:http'
 import net from 'node:net'
-import path from 'node:path'
 import { randomBytes, scryptSync, timingSafeEqual } from 'node:crypto'
 import { spawn } from 'node:child_process'
 
@@ -577,7 +579,10 @@ transport.useEncryption = true
     if (starting) return starting
     starting = run(listenPort, mesh, target)
     try {
-      return await starting
+      const out = await starting
+      // 记住「上次开着的组网口」，dsh web 重启后自动恢复（1.5.3）
+      if (out && out.ok) writeSidecar({ ...readSidecar(), meshPort: listenPort, meshPortAt: new Date().toISOString() })
+      return out
     } finally {
       starting = null
     }
@@ -705,12 +710,68 @@ transport.useEncryption = true
     const server = state.server
     state.server = null
     state.startedAt = null
+    // 手动关掉就不再自动恢复（1.5.3）
+    const side = readSidecar()
+    if (side.meshPort) writeSidecar({ ...side, meshPort: null, meshPortAt: null })
     if (!server) return { ok: true, ...snapshot() }
     await closeServer(server)
     state.error = null
     return { ok: true, ...snapshot() }
   }
 
+  // ===== 自动恢复（1.5.3）：dsh web 重启后，把上次开着的组网口自动开回来 =====
+  // 不阻塞启动：轮询等两件事就绪——上游端口绑定、组网网卡出现（开机时 TAP 可能晚几秒）。
+  // 任何一次 start 失败（含网卡一直没出现）都静默放弃，等用户回面板手动开。
+  {
+    const wanted = readSidecar().meshPort
+    if (wanted) {
+      let tries = 0
+      const timer = setInterval(() => {
+        tries += 1
+        if (state.server || tries > 60) return clearInterval(timer) // 已开（手动）或等了 5 分钟
+        if (!upstreamPort()) return
+        start(Number(wanted))
+          .then((out) => { if (out?.ok) { clearInterval(timer); ctx.logger?.info?.('dsh-mesh-access: 已自动恢复组网端口 ' + wanted) } })
+          .catch(() => {})
+      }, 5000)
+    }
+  }
+
+  /* —— billion-context 临时停用（组网/远程卡顿时的减负开关）—— */
+  const BC_MARKER = '# dsh-mesh-access managed (perf toggle)'
+  const profileRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../..')
+  const cordisPatch = () => path.join(profileRoot, 'cordis.patch.yml')
+  const bcDisabled = () => {
+    try { return fs.readFileSync(cordisPatch(), 'utf8').includes(BC_MARKER) } catch { return false }
+  }
+  const bcDaemonPids = () => {
+    try {
+      const out = execSync("pgrep -f 'billion-context/dist/index.js start' || true", { encoding: 'utf8' })
+      return out.trim() ? out.trim().split('\n') : []
+    } catch { return [] }
+  }
+  const bcDisable = () => {
+    const f = cordisPatch()
+    let text = ''
+    try { text = fs.readFileSync(f, 'utf8') } catch { text = '' }
+    if (!text.includes(BC_MARKER)) {
+      text = text.replace(/\s+$/, '\n') + `\n${BC_MARKER}\n- id: billion-context\n  disabled: true\n`
+      fs.writeFileSync(f, text)
+    }
+    for (const pid of bcDaemonPids()) { try { process.kill(Number(pid), 'SIGTERM') } catch {} }
+    return { ok: true, disabled: true, note: '已写入停用补丁并结束 billion-context 守护；重启 dsh web 后彻底不加载' }
+  }
+  const bcEnable = () => {
+    const f = cordisPatch()
+    try {
+      let text = fs.readFileSync(f, 'utf8')
+      const re = new RegExp('\\n?' + BC_MARKER.replace(/[()]/g, '\\$&') + '\\n- id: billion-context\\n\\s+disabled: true\\n?', 'g')
+      text = text.replace(re, '\n').replace(/\s+$/, '\n')
+      fs.writeFileSync(f, text)
+    } catch {}
+    return { ok: true, disabled: false, note: '已移除停用补丁；重启 dsh web 后恢复加载' }
+  }
+
   ctx.effect(() => {
     const routes = [
       {
@@ -735,6 +796,24 @@ transport.useEncryption = true
           return json(res, 400, { ok: false, error: "action 只能是 'start' 或 'stop'" })
         },
       },
+      {
+        kind: 'exact',
+        path: '/api/dsh-mesh-access/perf',
+        handler: async (req, res) => {
+          if (req.method === 'GET') {
+            return json(res, 200, { ok: true, bcDisabled: bcDisabled(), bcDaemons: bcDaemonPids().length })
+          }
+          if (req.method === 'POST') {
+            let body = {}
+            try { body = JSON.parse((await readBody(req)) || '{}') } catch { return json(res, 400, { ok: false, error: 'body 不是合法 JSON' }) }
+            const action = String(body.action ?? '')
+            if (action === 'disable-bc') return json(res, 200, bcDisable())
+            if (action === 'enable-bc') return json(res, 200, bcEnable())
+            return json(res, 400, { ok: false, error: "action 只能是 'disable-bc' 或 'enable-bc'" })
+          }
+          return json(res, 405, { ok: false, error: 'GET/POST only' })
+        },
+      },
       {
         kind: 'exact',
         path: '/api/dsh-mesh-access/auth',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-mesh-access",
-  "version": "1.5.2",
+  "version": "1.5.4",
   "description": "Control your DSH from your phone: opens a port on the mesh/VPN interface from inside the running server process, so a phone browser gets the same instance and the same session list — no SSH, no second dsh. Also reachable from another PC, a GUI NAS, or a TV box.",
   "type": "module",
   "main": "lib/index.js",