dsh-remote-plugin 0.6.10 → 0.6.11

package/README.en.md

@@ -8,12 +8,15 @@ The official DSH bundle plugin for DSH Remote. It adds a DSH sidebar entry, a co
 
 ```sh
 dsh plugin --profile web add dsh-remote-plugin
+dsh plugin --profile web list --depth 0
 
 # Optional version pin
 dsh plugin --profile web add dsh-remote-plugin@0.6.8
 ```
 
-Restart DSH Web and refresh the browser. The DSH Remote entry will appear in the sidebar.
+The second command verifies installation in the `web` profile. Completely restart DSH Web and hard-refresh with Ctrl+F5. For a user service, a typical restart is `systemctl --user restart dsh-web`; for a manual setup, stop the old `dsh web` process and launch it again.
+
+Open `http://127.0.0.1:8787/health` on the DSH host before pairing a phone. Once it returns JSON, connect the phone to `http://PC-LAN-IP:8787` or the host's Tailscale IP. Do not use `127.0.0.1` or `localhost` on the phone; those point to the phone itself.
 
 ## What the plugin provides
 
@@ -41,6 +44,22 @@ Notification settings include approval / question notifications, background poll
 
 The token grants remote control of DSH. Keep it private. For cross-network access, prefer Tailscale or another authenticated secure tunnel.
 
+## Gateway cannot be opened
+
+```bash
+curl -i http://127.0.0.1:8787/health
+ss -ltnp | grep ':8787'
+curl -i http://127.0.0.1:3080/
+```
+
+- If port 8787 refuses locally, verify the `web` profile installation, gateway state in the plugin panel, a real DSH Web restart, and port ownership.
+- If `/health` works but `upstreamOk` is false, the gateway is running; troubleshoot DSH Web on port 3080.
+- If local access works but the phone fails, use the host LAN/Tailscale IP and permit inbound TCP 8787. Do not expose port 3080 publicly.
+- A 401 response means the token is wrong; pair again or copy the current `~/.dsh-remote/token`.
+- For a blank/stale page after an upgrade, hard-refresh or fully close and reopen the app.
+
+The managed gateway may be a transient process. Do not rely on `systemctl --user restart dsh-remote-gateway.service`; use Start Gateway in the plugin panel or restart DSH Web to trigger self-healing.
+
 ## Links
 
 - Admin page: `http://<gateway-ip>:8787/admin`

package/README.md

@@ -8,12 +8,15 @@ DSH Remote 的官方 bundle 插件：在 DSH 侧边栏提供入口，打开快
 
 ```sh
 dsh plugin --profile web add dsh-remote-plugin
+dsh plugin --profile web list --depth 0
 
 # 也可以安装指定版本
 dsh plugin --profile web add dsh-remote-plugin@0.6.8
 ```
 
-重启 DSH Web 后刷新浏览器，左侧边栏会出现 DSH Remote 入口。
+第二条命令用于确认插件安装在正确的 `web` profile。然后完整重启 DSH Web 进程并 Ctrl+F5 强刷浏览器，左侧边栏会出现 DSH Remote 入口。如果 DSH Web 由 systemd 用户服务管理，可执行 `systemctl --user restart dsh-web`；手动运行时则需停止旧的 `dsh web` 进程后重新启动。
+
+安装后先在 DSH 主机访问 `http://127.0.0.1:8787/health`。看到 JSON 后再用手机连接 `http://电脑局域网IP:8787`；手机上的 `127.0.0.1` 和 `localhost` 指向手机自己，不是 DSH 主机。
 
 ## 插件提供什么
 
@@ -41,6 +44,22 @@ Android 应用 / 手机 WebUI 采用五个主要页面：会话、文件、主
 
 令牌等同于 DSH 远程操作凭证，请不要公开或提交到仓库。局域网访问建议配合防火墙；跨网络访问建议使用 Tailscale 或其他带认证的安全隧道。
 
+## 网关打不开
+
+```bash
+curl -i http://127.0.0.1:8787/health
+ss -ltnp | grep ':8787'
+curl -i http://127.0.0.1:3080/
+```
+
+- 8787 本机也拒绝连接：检查插件是否装在 `web` profile、插件面板的网关开关、DSH Web 是否真正重启，以及 8787 是否被占用。
+- `/health` 能打开但 `upstreamOk: false`：网关已运行，应检查 DSH Web 的 3080 端口。
+- 本机能打开但手机不能：使用电脑局域网/Tailscale IP，并允许防火墙 TCP 8787 入站；不需要对公网放行 3080。
+- 出现 401：重新扫码或复制 `~/.dsh-remote/token`。
+- 页面黑屏/功能未更新：Ctrl+F5 强刷，手机端完全退出后重开。
+
+插件网关可能以 transient 进程运行，不要依赖 `systemctl --user restart dsh-remote-gateway.service`。优先在插件面板启动网关，或重启 DSH Web 触发自愈。
+
 ## 相关地址
 
 - 管理页：`http://<网关IP>:8787/admin`

package/client.js

@@ -24,6 +24,61 @@ window.__ModuleLoader__.load({
     // 动态注入列布局, 让各 footer action 上下堆叠。
     var FOOTER_FIX_ID = 'dsh-remote-footer-stack'
     var FOOTER_FIX_CSS = '.kIs9zW_footerActions{flex-direction:column!important;align-items:stretch!important}'
+    var PLUGIN_THEMES = ['default', 'dark', 'light', 'neutral']
+    var ICON_PALETTES = {
+      default: { bg: '#F6F9FF', upper: '#4F7FEF', lower: '#8A64D8' },
+      dark: { bg: '#FFF4E3', upper: '#C66A00', lower: '#8A5A24' },
+      light: { bg: '#FFF9EF', upper: '#9B6A20', lower: '#66517F' },
+      neutral: { bg: '#F4F0DF', upper: '#585818', lower: '#832D15' },
+    }
+
+    function currentPluginTheme() {
+      var saved = null
+      try { saved = localStorage.getItem('dshTheme') } catch (_) {}
+      if (PLUGIN_THEMES.indexOf(saved) >= 0) return saved
+      return window.matchMedia('(prefers-color-scheme: light)').matches ? 'light' : 'default'
+    }
+
+    function usePluginTheme() {
+      var themeState = React.useState(currentPluginTheme)
+      var theme = themeState[0]
+      var setTheme = themeState[1]
+      React.useEffect(function () {
+        var mq = window.matchMedia('(prefers-color-scheme: light)')
+        function sync() { setTheme(currentPluginTheme()) }
+        function onStorage(e) { if (!e || e.key === 'dshTheme') sync() }
+        function onMessage(e) {
+          var d = e.data
+          if (e.origin !== location.origin || !d || d.source !== 'dsh-remote-theme' || d.type !== 'change') return
+          if (PLUGIN_THEMES.indexOf(d.theme) >= 0) setTheme(d.theme)
+        }
+        window.addEventListener('storage', onStorage)
+        window.addEventListener('message', onMessage)
+        if (mq.addEventListener) mq.addEventListener('change', sync)
+        else if (mq.addListener) mq.addListener(sync)
+        return function () {
+          window.removeEventListener('storage', onStorage)
+          window.removeEventListener('message', onMessage)
+          if (mq.removeEventListener) mq.removeEventListener('change', sync)
+          else if (mq.removeListener) mq.removeListener(sync)
+        }
+      }, [])
+      return theme
+    }
+
+    function PluginIcon() {
+      var palette = ICON_PALETTES[usePluginTheme()] || ICON_PALETTES.default
+      var common = {
+        fill: 'none', strokeWidth: 2.8, strokeLinecap: 'square', strokeLinejoin: 'miter',
+      }
+      return React.createElement('svg', {
+        viewBox: '0 0 24 24', 'aria-hidden': true, focusable: false,
+        style: { width: 16, height: 16, flexShrink: 0, display: 'block' },
+      },
+        React.createElement('rect', { x: .75, y: .75, width: 22.5, height: 22.5, rx: 5, fill: palette.bg, stroke: 'rgba(15, 23, 42, .14)', strokeWidth: 1 }),
+        React.createElement('path', Object.assign({ d: 'M10 6l4 4 4-4m-4 4 4 4', stroke: palette.upper }, common)),
+        React.createElement('path', Object.assign({ d: 'M6 10l4 4-4 4m4-4 4 4', stroke: palette.lower }, common)))
+    }
 
     function useFooterStack() {
       React.useEffect(function () {
@@ -59,10 +114,7 @@ window.__ModuleLoader__.load({
           font: '500 13px/1.3 system-ui, sans-serif', textAlign: 'left',
         },
       },
-        React.createElement('img', {
-          src: '/remote/icon.svg', alt: '', 'aria-hidden': true,
-          style: { width: 16, height: 16, flexShrink: 0 },
-        }),
+        React.createElement(PluginIcon),
         props.wide ? React.createElement('span', null, 'DSH Remote') : null)
     }
 

package/gateway-stats.cjs

@@ -6,7 +6,7 @@
  *
  * 聚合:
  *   time(UTC 毫秒) -> Asia/Shanghai(固定 UTC+8, 无夏令时) -> 日 × 小时 × 模型
- *   时段: 高峰 9:00-12:00 / 14:00-18:00(含起点, 不含终点), 其余空闲
+ *   时段: 工作日高峰 9:00-12:00 / 14:00-18:00(含起点, 不含终点), 周末全天空闲
  *   四桶: input(未缓存输入) / cacheRead(缓存命中读) / cacheWrite(缓存写) / output(输出)
  *
  * 存储:
@@ -24,7 +24,7 @@ const { spawn } = require('node:child_process')
 const readline = require('node:readline')
 
 // ---------- 固定价格表(v1 硬编码; v2 将改为配置文件/环境变量) ----------
-// 时段判定: 北京时间 9:00-12:00 与 14:00-18:00 为高峰(含起点不含终点)
+// 时段判定: 工作日北京时间 9:00-12:00 与 14:00-18:00 为高峰(含起点不含终点)，周末全天谷时
 const PEAK_HOURS = [[9, 12], [14, 18]]
 const PRICES = {
   'deepseek-v4-flash': {
@@ -73,6 +73,19 @@ function periodOfHour(hour) {
   return 'off'
 }
 
+/** 北京自然日是否为周六/周日。 */
+function isWeekendDate(date) {
+  const parts = String(date || '').split('-').map(Number)
+  if (parts.length !== 3 || parts.some(n => !Number.isInteger(n))) return false
+  const day = new Date(Date.UTC(parts[0], parts[1] - 1, parts[2])).getUTCDay()
+  return day === 0 || day === 6
+}
+
+/** 北京日期 + 小时 -> 计费时段；周末全天谷时。 */
+function periodOfDateHour(date, hour) {
+  return isWeekendDate(date) ? 'off' : periodOfHour(hour)
+}
+
 /** 时段单价; 未知模型返回全 0(统计照记, 费用为 0)。 */
 function pricesFor(model) {
   return PRICES[model] || null
@@ -105,6 +118,11 @@ function addUsage(bucket, model, period, usage) {
   return bucket
 }
 
+/** 按当前日期规则重算 bucket 费用，兼容升级前已按工作日价格写入的周末历史数据。 */
+function pricedBucket(model, period, bucket) {
+  return addUsage(emptyBucket(), model, period, bucket)
+}
+
 function mergeBucket(dst, src) {
   for (const key of ['input', 'cacheRead', 'cacheWrite', 'output', 'cost']) {
     dst[key] += src[key]
@@ -114,7 +132,9 @@ function mergeBucket(dst, src) {
 
 /** 时段事件 -> 日/小时/模型聚合的 key。 */
 function eventKey(timeMs) {
-  return { date: beijingDate(timeMs), hour: beijingHour(timeMs), period: periodOfHour(beijingHour(timeMs)) }
+  const date = beijingDate(timeMs)
+  const hour = beijingHour(timeMs)
+  return { date, hour, period: periodOfDateHour(date, hour) }
 }
 
 /** 事件里的模型: 优先 message.source.model。 */
@@ -143,9 +163,10 @@ function summarizeDay(day) {
   const off = emptyBucket()
   for (const hourStr of Object.keys(day?.hours || {})) {
     const hour = Number(hourStr)
-    const target = periodOfHour(hour) === 'peak' ? peak : off
+    const period = periodOfDateHour(day?.date, hour)
+    const target = period === 'peak' ? peak : off
     for (const model of Object.keys(day.hours[hourStr] || {})) {
-      mergeBucket(target, day.hours[hourStr][model])
+      mergeBucket(target, pricedBucket(model, period, day.hours[hourStr][model]))
     }
   }
   const total = emptyBucket()
@@ -403,11 +424,12 @@ class StatsStore {
       const s = dayTotals(day)
       const byModel = {}
       for (const hourStr of Object.keys(day.hours || {})) {
-        const period = periodOfHour(Number(hourStr))
+        const period = periodOfDateHour(date, Number(hourStr))
         for (const [model, bucket] of Object.entries(day.hours[hourStr])) {
           const m = byModel[model] || (byModel[model] = { peak: emptyBucket(), off: emptyBucket(), total: emptyBucket() })
-          mergeBucket(m[period], bucket)
-          mergeBucket(m.total, bucket)
+          const priced = pricedBucket(model, period, bucket)
+          mergeBucket(m[period], priced)
+          mergeBucket(m.total, priced)
         }
       }
       out.push({ date, ...s, byModel })
@@ -421,10 +443,14 @@ class StatsStore {
     const day = this._loadDay(effective)
     const hours = []
     for (let hour = 0; hour < 24; hour++) {
-      const models = day.hours[hour] || {}
+      const period = periodOfDateHour(effective, hour)
+      const models = {}
       const total = emptyBucket()
-      for (const bucket of Object.values(models)) mergeBucket(total, bucket)
-      hours.push({ hour, period: periodOfHour(hour), models, total })
+      for (const [model, bucket] of Object.entries(day.hours[hour] || {})) {
+        models[model] = pricedBucket(model, period, bucket)
+        mergeBucket(total, models[model])
+      }
+      hours.push({ hour, period, models, total })
     }
     return { date: effective, pricingStart: PRICING_START_DATE, hours }
   }
@@ -438,8 +464,11 @@ module.exports = {
   beijingHour,
   beijingDate,
   periodOfHour,
+  isWeekendDate,
+  periodOfDateHour,
   emptyBucket,
   addUsage,
+  pricedBucket,
   summarizeDay,
   dayTotals,
   eventKey,

package/gateway.cjs

@@ -43,6 +43,7 @@ try {
 
 const ROOT = __dirname
 const PUBLIC_DIR = path.join(ROOT, 'public')
+const ANNOUNCEMENTS_FILE = process.env.DSH_REMOTE_ANNOUNCEMENTS_FILE || path.join(PUBLIC_DIR, 'announcements.json')
 const PORT = Number(process.env.PORT) || 8787
 const HOST = process.env.HOST || '0.0.0.0'
 
@@ -166,6 +167,14 @@ const FS_MIME = {
   '.epub': 'application/epub+zip',
   '.wasm': 'application/wasm',
 }
+const FS_PREVIEW_MAX = 1024 * 1024
+const FS_PREVIEW_EXTENSIONS = new Set([
+  '.txt', '.md', '.markdown', '.log', '.json', '.jsonl', '.js', '.mjs', '.cjs', '.jsx',
+  '.ts', '.tsx', '.py', '.css', '.html', '.htm', '.xml', '.yaml', '.yml', '.toml',
+  '.ini', '.conf', '.env', '.sh', '.bash', '.zsh', '.fish', '.sql', '.java', '.kt',
+  '.kts', '.go', '.rs', '.c', '.h', '.cpp', '.hpp', '.cs', '.php', '.rb', '.vue',
+  '.svelte', '.gradle', '.properties', '.gitignore', '.dockerfile'
+])
 
 // ---------- token ----------
 function loadToken() {
@@ -991,6 +1000,25 @@ function maskIp(ip) {
   return s
 }
 
+function validatePollVote(payload) {
+  const announcementId = String(payload.announcementId || '').trim()
+  const pollId = String(payload.pollId || '').trim()
+  const optionId = String(payload.optionId || '').trim()
+  if (!announcementId || !pollId || !optionId) return { error: 'poll fields required' }
+  if (announcementId.length > 120 || pollId.length > 120 || optionId.length > 120) return { error: 'poll fields too long' }
+  let source
+  try { source = JSON.parse(fs.readFileSync(ANNOUNCEMENTS_FILE, 'utf8')) } catch { return { error: 'poll config unavailable' } }
+  const items = Array.isArray(source) ? source : (Array.isArray(source?.items) ? source.items : [source])
+  const announcement = items.find(item => String(item?.id || '').trim() === announcementId)
+  const poll = announcement?.poll
+  if (!poll || String(poll.id || '').trim() !== pollId || !Array.isArray(poll.options)) return { error: 'poll not found' }
+  const option = poll.options.find(item => String(item?.id || '').trim() === optionId)
+  if (!option) return { error: 'poll option not found' }
+  const optionLabel = String(option.label || '').trim().slice(0, 200)
+  if (!optionLabel) return { error: 'poll option invalid' }
+  return { announcementId, pollId, optionId, optionLabel }
+}
+
 function serveFeedback(req, res, url) {
   cors(res)
   if (req.method === 'OPTIONS') {
@@ -1024,14 +1052,23 @@ function serveFeedback(req, res, url) {
       return
     }
     const type = payload.type
-    const message = String(payload.message || '').trim()
+    let message = String(payload.message || '').trim()
     const contact = String(payload.contact || '').trim()
     const appVersion = String(payload.appVersion || '').trim()
-    if (!['bug', 'suggestion', 'other'].includes(type)) {
+    if (!['bug', 'suggestion', 'other', 'poll'].includes(type)) {
+      res.writeHead(400, { 'content-type': 'application/json; charset=utf-8' })
+      res.end(JSON.stringify({ error: 'invalid type', expect: 'bug|suggestion|other|poll' }))
+      return
+    }
+    const pollVote = type === 'poll' ? validatePollVote(payload) : null
+    if (pollVote?.error) {
       res.writeHead(400, { 'content-type': 'application/json; charset=utf-8' })
-      res.end(JSON.stringify({ error: 'invalid type', expect: 'bug|suggestion|other' }))
+      res.end(JSON.stringify({ error: pollVote.error }))
       return
     }
+    // 公网收集器的旧版只保留 type/message 等通用字段。同时发送结构化
+    // 字段和稳定的 message 编码，旧收集器也能用 scripts/summarize-polls.mjs 汇总。
+    if (pollVote) message = 'POLL ' + JSON.stringify({ announcementId: pollVote.announcementId, pollId: pollVote.pollId, optionId: pollVote.optionId })
     if (!message) {
       res.writeHead(400, { 'content-type': 'application/json; charset=utf-8' })
       res.end(JSON.stringify({ error: 'message required' }))
@@ -1068,7 +1105,8 @@ function serveFeedback(req, res, url) {
         contact: contact || undefined,
         appVersion: appVersion || 'unknown',
         gatewayVersion: VERSION,
-        clientIp: maskIp(ip)
+        clientIp: maskIp(ip),
+        ...(pollVote || {})
       }),
       signal: AbortSignal.timeout(8000)
     }).then(async (r) => {
@@ -1108,6 +1146,24 @@ function serveStatic(req, res, url) {
   }
   if (pathname === '/') pathname = '/index.html'
   if (pathname === '/admin') pathname = '/admin.html'
+  if (pathname === '/announcements.json') {
+    fs.readFile(ANNOUNCEMENTS_FILE, 'utf8', (err, raw) => {
+      if (err) {
+        res.writeHead(404, { 'content-type': 'text/plain; charset=utf-8' })
+        res.end('404 Not Found')
+        return
+      }
+      try { JSON.parse(raw) } catch {
+        res.writeHead(500, { 'content-type': 'application/json; charset=utf-8', 'cache-control': 'no-store' })
+        res.end(JSON.stringify({ error: 'invalid announcements config' }))
+        return
+      }
+      cors(res)
+      res.writeHead(200, { 'content-type': 'application/json; charset=utf-8', 'cache-control': 'no-store' })
+      res.end(req.method === 'HEAD' ? '' : raw)
+    })
+    return
+  }
   // 兼容旧版 App(版本比较不认 -rc): 无 local 参数的请求把 0.5.2-rc.1 显示为 0.5.2,
   // 引导升级到新 APK; 新 App 带 ?local= 拿到真实 rc 版本, 不会循环提示。
   if (pathname === '/update.json') {
@@ -1485,6 +1541,45 @@ function fsFile(req, res, url) {
   stream.pipe(res)
 }
 
+function fsPreview(req, res, url) {
+  if (req.method !== 'GET') {
+    res.writeHead(405, { allow: 'GET' })
+    res.end()
+    return
+  }
+  if (!fsAuthorized(req, url, res)) return
+  const resolved = fsResolve(url.searchParams.get('path') ?? '')
+  if (resolved.error) return fsJson(res, resolved.error === 'forbidden' ? 403 : 404, { error: resolved.error })
+  const checked = fsRealChecked(resolved.abs)
+  if (checked.error) return fsJson(res, checked.error === 'forbidden' ? 403 : 404, { error: checked.error })
+
+  let st
+  try { st = fs.statSync(checked.abs) } catch (err) {
+    return fsJson(res, err.code === 'ENOENT' ? 404 : 403, { error: err.code === 'ENOENT' ? 'not-found' : 'permission-denied' })
+  }
+  if (!st.isFile()) return fsJson(res, 400, { error: 'not-a-file' })
+
+  const name = path.basename(checked.abs)
+  const lowerName = name.toLowerCase()
+  const extension = lowerName === 'dockerfile' ? '.dockerfile' : path.extname(lowerName)
+  if (!FS_PREVIEW_EXTENSIONS.has(extension)) {
+    return fsJson(res, 415, { error: 'preview-unsupported', extension })
+  }
+  if (st.size > FS_PREVIEW_MAX) {
+    return fsJson(res, 413, { error: 'preview-too-large', size: st.size, limit: FS_PREVIEW_MAX })
+  }
+
+  let content
+  try {
+    const bytes = fs.readFileSync(checked.abs)
+    if (bytes.includes(0)) return fsJson(res, 415, { error: 'preview-binary' })
+    content = bytes.toString('utf8')
+  } catch (err) {
+    return fsJson(res, 403, { error: 'permission-denied', detail: err.message })
+  }
+  fsJson(res, 200, { name, path: resolved.abs, extension, size: st.size, content })
+}
+
 function fsValidName(name) {
   if (typeof name !== 'string') return false
   if (!name || name === '.' || name === '..') return false
@@ -1948,6 +2043,7 @@ function serveFs(req, res, url) {
 
   if (sub === '/list') return fsList(req, res, url)
   if (sub === '/file') return fsFile(req, res, url)
+  if (sub === '/preview') return fsPreview(req, res, url)
   if (sub === '/mkdir') return fsMkdir(req, res, url)
   if (sub === '/upload-probe') return fsUploadProbe(req, res, url)
   if (sub === '/upload-control') return fsUploadControl(req, res, url)

package/package.json

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