dsh-remote-plugin 0.5.9 → 0.6.1

package/gateway.cjs

@@ -182,9 +182,18 @@ function authorized(req, url) {
 
 // ---------- 设备监控 ----------
 const devices = new Map()   // ip -> device
+// 设备 TTL 是“记录保留时间”，和下方 online 判断的 60s 活跃窗口是两回事：
+// online 只看最近 60s 是否有请求；TTL 用于防止长期运行的网关内存/响应无限膨胀。
+const DEVICE_TTL_MS = 24 * 60 * 60 * 1000
 let totalRequests = 0
 let authFailures = 0
 
+function pruneDevices(now = Date.now()) {
+  for (const [ip, d] of devices) {
+    if (now - d.lastSeen > DEVICE_TTL_MS) devices.delete(ip)
+  }
+}
+
 function loadNotes() {
   try { return JSON.parse(fs.readFileSync(NOTES_FILE, 'utf8')) } catch { return {} }
 }
@@ -211,6 +220,7 @@ function kindOf(req) {
 }
 
 function touchDevice(req, extra = {}) {
+  pruneDevices()
   const ip = ipOf(req)
   totalRequests++
   let d = devices.get(ip)
@@ -402,6 +412,120 @@ function cors(res) {
   res.setHeader('access-control-allow-methods', 'GET, POST, OPTIONS')
 }
 
+// ---------- 事件轮询缓冲 ----------
+// 网关自己维护到 DSH 的 mux/host WebSocket，把事件写入内存环形缓冲；
+// 前端在 WebSocket 被隧道/受限网络阻断时改走 GET /api/events.poll 增量拉取。
+const EVENT_BUFFER_MAX = 300
+const EVENT_MAX_STRING = 16 * 1024
+const eventBuffers = { mux: [], host: [] }
+const eventNextSeq = { mux: 1, host: 1 }
+
+/** 递归截断超大字段，避免单条超大事件撑爆环形缓冲。 */
+function truncateEventValue(v, depth = 0) {
+  if (typeof v === 'string') return v.length > EVENT_MAX_STRING ? v.slice(0, EVENT_MAX_STRING) + '…[truncated]' : v
+  if (Array.isArray(v)) {
+    if (depth > 3 || v.length > 200) return v.slice(0, 200)
+    return v.map(x => truncateEventValue(x, depth + 1))
+  }
+  if (v && typeof v === 'object' && depth <= 3) {
+    const out = {}
+    for (const k of Object.keys(v)) out[k] = truncateEventValue(v[k], depth + 1)
+    return out
+  }
+  return v
+}
+
+function pushEvent(kind, full) {
+  if (!eventBuffers[kind] || !full || typeof full !== 'object') return
+  const buf = eventBuffers[kind]
+  buf.push({ seq: eventNextSeq[kind]++, ts: Date.now(), event: truncateEventValue(full) })
+  if (buf.length > EVENT_BUFFER_MAX) buf.shift()
+}
+
+function serveEventPoll(req, res, url) {
+  if (req.method !== 'GET') {
+    res.writeHead(405, { allow: 'GET' })
+    res.end()
+    return
+  }
+  if (!authorized(req, url)) {
+    authFailures++
+    touchDevice(req, { failedAuth: true })
+    cors(res)
+    res.writeHead(401, { 'content-type': 'application/json; charset=utf-8' })
+    res.end(JSON.stringify({ error: 'unauthorized' }))
+    return
+  }
+  touchDevice(req)
+  const kind = url.searchParams.get('kind')
+  if (kind !== 'mux' && kind !== 'host') {
+    cors(res)
+    res.writeHead(400, { 'content-type': 'application/json; charset=utf-8' })
+    res.end(JSON.stringify({ error: 'bad-kind', detail: 'kind 必须是 mux 或 host' }))
+    return
+  }
+  const sinceRaw = url.searchParams.get('since')
+  const since = sinceRaw === null ? 0 : Number(sinceRaw)
+  if (!Number.isSafeInteger(since) || since < 0) {
+    cors(res)
+    res.writeHead(400, { 'content-type': 'application/json; charset=utf-8' })
+    res.end(JSON.stringify({ error: 'bad-since', detail: 'since 必须是非负整数' }))
+    return
+  }
+  const buf = eventBuffers[kind]
+  const events = buf.filter(r => r.seq > since)
+  const latestSeq = buf.length ? buf[buf.length - 1].seq : 0
+  const truncated = buf.length > 0 && since < buf[0].seq - 1
+  cors(res)
+  res.writeHead(200, {
+    'content-type': 'application/json; charset=utf-8',
+    'cache-control': 'no-store'
+  })
+  res.end(JSON.stringify({ ok: true, kind, since, latestSeq, truncated, events }))
+}
+
+/** 网关自带上游事件采集：mux/host 各一条 WS，断线自动重连。 */
+function startEventCollector(kind) {
+  if (typeof WebSocket !== 'function') return null
+  let ws = null
+  let stopped = false
+  let retryTimer = null
+  const url = `ws://${UPSTREAM.hostname}:${UPSTREAM.port}/api/events.${kind}?client=web`
+  const connect = () => {
+    if (stopped) return
+    try {
+      ws = new WebSocket(url)
+    } catch {
+      retryTimer = setTimeout(connect, 3000)
+      return
+    }
+    ws.onopen = () => {
+      if (stopped) { try { ws.close() } catch {} }
+    }
+    ws.onmessage = (ev) => {
+      if (stopped) return
+      try {
+        const data = typeof ev.data === 'string' ? ev.data : Buffer.isBuffer(ev.data) ? ev.data.toString() : String(ev.data)
+        pushEvent(kind, JSON.parse(data))
+      } catch {}
+    }
+    ws.onclose = () => {
+      ws = null
+      if (!stopped) retryTimer = setTimeout(connect, 3000)
+    }
+    ws.onerror = () => { try { ws.close() } catch {} }
+  }
+  connect()
+  return {
+    kind,
+    close() {
+      stopped = true
+      clearTimeout(retryTimer)
+      try { ws?.close() } catch {}
+    }
+  }
+}
+
 // ---------- 统计 API ----------
 let statsScanning = false
 async function scanStatsOnce(delay) {
@@ -1498,6 +1622,10 @@ function proxyApi(req, res, url) {
     headers[k] = v
   }
   headers.host = UPSTREAM.host
+  // /remote/* 由 DSH 插件端点处理；插件侧用网关自身 token 鉴权。
+  if (url.pathname.startsWith('/remote/')) {
+    headers.authorization = 'Bearer ' + TOKEN
+  }
 
   const upstreamReq = http.request({
     hostname: UPSTREAM.hostname,
@@ -1548,6 +1676,8 @@ const server = http.createServer((req, res) => {
     if (url.pathname === '/feedback') return serveFeedback(req, res, url)
     if (url.pathname.startsWith('/admin/api')) return serveAdminApi(req, res, url)
     if (url.pathname.startsWith('/stats')) return serveStats(req, res, url)
+    if (url.pathname === '/api/events.poll') return serveEventPoll(req, res, url)
+    if (url.pathname.startsWith('/remote/')) return proxyApi(req, res, url)
     if (url.pathname.startsWith('/api/')) return proxyApi(req, res, url)
     if (url.pathname === '/health') return serveHealth(res)
     touchDevice(req)
@@ -1669,6 +1799,9 @@ server.listen(PORT, HOST, () => {
     console.log('  提示: 监听在 127.0.0.1, 手机请改用 Tailscale serve 或设置 HOST=0.0.0.0')
   }
   console.log('  上游:  ' + UPSTREAM.origin + '  (Ctrl+C 退出)')
+  // 事件轮询缓冲：网关自身上游 WS 采集，断线自动重连
+  startEventCollector('mux')
+  startEventCollector('host')
   // 启动 8 秒后首查, 之后每 6 小时查一次 GitHub/镜像最新版
   setTimeout(() => checkForUpdates(false), 8000)
   setInterval(() => checkForUpdates(false), UPDATE_INTERVAL_MS)

package/index.mjs

@@ -13,7 +13,7 @@ import { dirname, extname, normalize, resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
 export const name = 'dsh-remote'
-export const inject = ['webServer']
+export const inject = ['webServer', 'commands', 'agents']
 
 const MOUNT = '/remote'
 const PUBLIC_DIR = fileURLToPath(new URL('./public/', import.meta.url))
@@ -284,6 +284,25 @@ function statsSend(session, event) {
   statsQueues.set(session.id, next)
 }
 
+/** 从 sessionId 解析 DSH Agent：优先取已发布 live agent，否则走 resume。返回 { agent, resolvePath } 便于定位。 */
+async function resolveAgent(ctx, sessionId) {
+  if (!ctx.agents) return { agent: null, resolvePath: 'no-agents-service' }
+  let live
+  try {
+    live = ctx.agents.get(sessionId)
+  } catch (e) {
+    live = undefined
+  }
+  if (live) return { agent: live, resolvePath: 'live' }
+  try {
+    const handle = await ctx.agents.resume({ resumeSessionId: sessionId })
+    if (!handle || !handle.agent) return { agent: null, resolvePath: 'resume-empty-handle' }
+    return { agent: handle.agent, resolvePath: 'resume' }
+  } catch (e) {
+    return { agent: null, resolvePath: 'resume-error: ' + (e?.message || String(e)) }
+  }
+}
+
 async function resolveFile(pathname) {
   let abs = targetPath(pathname)
   if (abs === null) return null
@@ -313,7 +332,7 @@ async function resolveFile(pathname) {
   }
 }
 
-async function serveStatic(req, res) {
+async function serveStatic(req, res, ctx) {
   const pathname = new URL(req.url ?? '/', 'http://x').pathname
 
   // 无尾斜杠的入口重定向到带斜杠版本:
@@ -417,6 +436,52 @@ async function serveStatic(req, res) {
     return
   }
 
+  // 斜杠命令桥接：客户端 → 网关 → 插件端点 → ctx.commands.execute
+  if (pathname === `${MOUNT}/api/command`) {
+    if (req.method !== 'POST') {
+      res.writeHead(405, { allow: 'POST' })
+      res.end()
+      return
+    }
+    const auth = req.headers.authorization || ''
+    const expected = gatewayToken()
+    if (!expected || auth !== `Bearer ${expected}`) {
+      sendJson(res, 401, { ok: false, message: 'unauthorized' })
+      return
+    }
+    let body
+    try {
+      body = JSON.parse((await readBody(req, 8192)) || '{}')
+    } catch {
+      sendJson(res, 400, { ok: false, message: 'invalid json' })
+      return
+    }
+    const { sessionId, line } = body || {}
+    if (!sessionId || typeof line !== 'string') {
+      sendJson(res, 400, { ok: false, message: 'sessionId and line required' })
+      return
+    }
+    try {
+      const { agent, resolvePath } = await resolveAgent(ctx, sessionId)
+      if (!agent) {
+        sendJson(res, 200, { ok: false, message: 'agent not found', debug: { resolvePath, commandNames: [] } })
+        return
+      }
+      let commandNames = []
+      try {
+        commandNames = (await ctx.commands.list(agent)).map(c => c.name)
+      } catch (e) {
+        commandNames = ['list-error: ' + (e?.message || String(e))]
+      }
+      const signal = AbortSignal.timeout(30000)
+      const result = await ctx.commands.execute(agent, line, signal)
+      sendJson(res, 200, { ok: true, executed: result !== undefined, debug: { resolvePath, commandNames } })
+    } catch (e) {
+      sendJson(res, 200, { ok: false, message: e?.message || String(e) })
+    }
+    return
+  }
+
   if (req.method !== 'GET' && req.method !== 'HEAD') {
     res.writeHead(405, { allow: 'GET, HEAD' })
     res.end()
@@ -446,7 +511,7 @@ export function apply(ctx) {
   ctx.effect(() => ctx.webServer.register({
     kind: 'prefix',
     path: MOUNT,
-    handler: serveStatic,
+    handler: (req, res) => serveStatic(req, res, ctx),
   }), 'dsh-remote: /remote route')
   // 实时统计: 监听 DSH 会话事件流, 把带 usage 的 assistant/message 投递到网关聚合
   ctx.on('session/event', (session, event) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-remote-plugin",
-  "version": "0.5.9",
+  "version": "0.6.1",
   "description": "DSH Remote 官方 bundle 插件：DSH 左侧原生边栏入口 + 右侧抽屉内嵌管理控制台；内置网关随 DSH 自动启停(systemd 独立单元)，抽屉直显令牌与设备监控；网关提供 /fs/* 文件传输端点(列表/断点下载/上传)，配合 Android App 远程操控会话/审批/提问/goal 与文件互传(多服务器测速切换、聊天记录离线缓存)。",
   "type": "module",
   "main": "./index.mjs",

package/public/admin.html

@@ -184,6 +184,7 @@
           <svg viewBox="0 0 16 16" aria-hidden="true"><path d="M8 0C3.58 0 0 3.58 0 8a8.01 8.01 0 0 0 5.47 7.59c.4.08.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27s1.36.09 2 .27c1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.01 8.01 0 0 0 16 8c0-4.42-3.58-8-8-8Z"/></svg>
           <span class="gh-label" data-i18n="repo">仓库</span>
         </a>
+        <button id="btn-donate" class="mini-btn tb-btn" data-i18n-title="donateTitle">🎁</button>
         <div class="fb-wrap">
           <button id="btn-feedback" class="mini-btn fb-btn tb-btn" data-i18n-title="feedbackTitle" data-i18n-aria="feedbackTitle" aria-haspopup="menu" aria-expanded="false">
             <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M21 12a8 8 0 0 1-8 8H5l-1.5 2L4 20a8 8 0 0 1-1-4 8 8 0 0 1 18-4Z"/></svg>
@@ -271,6 +272,20 @@
     </div>
   </div>
 
+  <!-- 赞赏支持模态 -->
+  <div id="modal-donate" class="modal hidden">
+    <div class="modal-card">
+      <div class="modal-title" data-i18n="donateTitle">赞赏支持</div>
+      <div class="modal-body donate-body">
+        <img src="donate.png" alt="" class="donate-img" style="display:block;margin:0 auto;max-width:100%;max-height:60vh;border-radius:8px">
+        <p class="donate-thanks" data-i18n="donateThanks" style="text-align:center;margin-top:12px">感谢你的支持 ☕</p>
+      </div>
+      <div class="modal-actions">
+        <button id="donate-close" class="btn subtle" data-i18n="theme.close">关闭</button>
+      </div>
+    </div>
+  </div>
+
   <div id="toast" class="toast hidden"></div>
   <script>
     window.ADMIN_STR = {
@@ -282,6 +297,7 @@
         'theme.default': '默认深空', 'theme.dark': '落日', 'theme.light': '易北爱乐厅', 'theme.neutral': '草原孤塔',
         'theme.panelTitle': '选择配色', 'theme.close': '关闭',
         'repo': '仓库',
+        'donateTitle': '赞赏支持', 'donateThanks': '感谢你的支持 ☕',
         'feedbackTitle': '反馈渠道',
         'feedback.githubDesc': '反馈 bug / 提建议', 'feedback.giteeDesc': '国内镜像，无需代理', 'feedback.biliDesc': 'UP 动态页交流',
         'unauth': '未认证',
@@ -356,6 +372,7 @@
         'theme.default': 'Default', 'theme.dark': 'Sunset', 'theme.light': 'Elbphilharmonie', 'theme.neutral': 'Prairie Tower',
         'theme.panelTitle': 'Choose theme', 'theme.close': 'Close',
         'repo': 'Repo',
+        'donateTitle': 'Support', 'donateThanks': 'Thanks for your support ☕',
         'feedbackTitle': 'Feedback',
         'feedback.githubDesc': 'Report bugs · suggest features', 'feedback.giteeDesc': 'Mirror in China, no proxy needed', 'feedback.biliDesc': 'Chat on the UP\'s Bilibili page',
         'unauth': 'Not connected',

package/public/admin.js

@@ -482,6 +482,11 @@ function openThemePanel() {
   $('modal-theme').classList.remove('hidden')
 }
 
+function openDonateModal() {
+  const m = $('modal-donate')
+  if (m) m.classList.remove('hidden')
+}
+
 $('btn-lang').addEventListener('click', () => {
   I18N.setLang(I18N.lang === 'zh' ? 'en' : 'zh')
   renderLangBtn()
@@ -492,6 +497,10 @@ $('btn-lang').addEventListener('click', () => {
 
 $('btn-theme').addEventListener('click', openThemePanel)
 $('theme-close').addEventListener('click', () => $('modal-theme').classList.add('hidden'))
+// 赞赏支持
+$('btn-donate').addEventListener('click', openDonateModal)
+$('donate-close').addEventListener('click', () => $('modal-donate').classList.add('hidden'))
+$('modal-donate').addEventListener('click', (e) => { if (e.target === $('modal-donate')) $('modal-donate').classList.add('hidden') })
 // 反馈
 $('btn-feedback').addEventListener('click', (e) => { e.stopPropagation(); toggleFeedbackMenu() })
 $('fb-menu').addEventListener('click', (e) => {