dsh-remote-plugin 0.6.3 → 0.6.5

package/public/index.html

@@ -250,7 +250,10 @@
           </div>
           <div class="setting-row">
             <div><div class="setting-name" data-i18n="settings.scanTitle">扫码连接</div><div class="setting-desc" data-i18n="settings.scanDesc">拍照/相册本地解码（无谷歌服务依赖）；也可系统相机扫码或手动粘贴</div></div>
-            <button id="btn-scan-pair" class="mini-btn" data-i18n="settings.scan">扫码</button>
+            <div class="setting-actions">
+              <button id="btn-scan-camera" class="mini-btn" data-i18n="scan.promptPhoto">拍照扫描</button>
+              <button id="btn-scan-gallery" class="mini-btn" data-i18n="scan.promptGallery">从相册选择</button>
+            </div>
           </div>
         </div>
       </div>
@@ -271,6 +274,10 @@
             <div><div class="setting-name" data-i18n="settings.peakRemindTitle">峰谷计费提醒</div><div class="setting-desc" data-i18n="settings.peakRemindDesc">每天 9:00 / 12:00 / 14:00 / 18:00 推送峰谷切换（App 内有效）</div></div>
             <label class="switch"><input type="checkbox" id="opt-peak-remind"><span class="slider"></span></label>
           </div>
+          <div class="setting-row">
+            <div><div class="setting-name" data-i18n="settings.testNotifyTitle">测试通知</div><div class="setting-desc" data-i18n="settings.testNotifyDesc">立即排一条 3 秒后的本地通知，用于排查系统通知限制</div></div>
+            <button id="btn-test-notify" class="mini-btn" data-i18n="settings.testNotify">发送测试通知</button>
+          </div>
           <div class="setting-row">
             <div><div class="setting-name" data-i18n="settings.bgTitle">后台轮询</div><div class="setting-desc" data-i18n="settings.bgDesc">退后台后由前台服务定时拉取事件，待办审批/提问不遗漏</div><div id="bg-auth-status" class="setting-desc hidden" data-i18n="settings.bgAuthFailed">登录失效：连续 3 次 401，后台轮询已停止</div></div>
             <label class="switch"><input type="checkbox" id="opt-bg-poll"><span class="slider"></span></label>
@@ -484,6 +491,7 @@
       zh: {
         'a11y.hostAdmin': '主机管理', 'a11y.refresh': '刷新', 'a11y.more': '更多操作', 'a11y.moreTitle': '指令/权限/模型',
         'conn.on': '已连接', 'conn.off': '未连接', 'conn.reconnecting': '连接中断，正在重连…',
+        'conn.reconnectIn': '重连中 {n}s', 'conn.offline': '离线', 'conn.failed': '连接失败',
         'conn.poll': '轮询', 'conn.pollTitle': '当前网络不支持实时推送，已降级为轮询（延迟数秒）',
         'conn.titleGroup': '{group} · {url}（{ms}）',
         'common.refreshing': '刷新中…',
@@ -530,7 +538,7 @@
         'session.confirmStop': '停止当前会话正在运行的任务？', 'session.stopFailed': '停止失败', 'session.stopRequested': '已请求停止',
         'notify.approvalTitle': '工具审批', 'notify.approvalBody': '{tool} 需要批准', 'notify.questionTitle': 'DSH 提问', 'notify.questionBody': '需要你回答',
         'notify.permissionFailed': '通知权限申请失败：{msg}',
-        'history.loading': '加载历史…', 'history.cacheFallback': '网络不可用：显示本地缓存的历史', 'history.loadFailed': '加载历史失败：{msg}',
+        'history.loading': '加载历史…', 'history.cacheFallback': '网络不可用：显示本地缓存的历史', 'history.loadFailed': '加载历史失败：{msg}', 'history.retry': '重试',
         'history.offlineCache': '离线缓存 {n} 条', 'history.count': '{n} 条', 'history.empty': '还没有消息',
         'history.queueAndCount': '队列 {q} · 历史 {n}', 'history.countOnly': '历史 {n}',
         'role.me': '我', 'role.dsh': 'DSH',
@@ -610,6 +618,8 @@
         'settings.servers': '服务器地址（可多个）', 'settings.speedTest': '测速', 'settings.add': '添加',
         'settings.scanTitle': '扫码连接', 'settings.scanDesc': '拍照/相册本地解码（无谷歌服务依赖）；也可系统相机扫码或手动粘贴', 'settings.scan': '扫码',
         'settings.notifyTitle': '通知', 'settings.notifyDesc': '收到审批/提问时推送',
+        'settings.testNotifyTitle': '测试通知', 'settings.testNotifyDesc': '立即排一条 3 秒后的本地通知，用于排查系统通知限制', 'settings.testNotify': '发送测试通知',
+        'settings.testNotifySent': '测试通知已排定，3 秒后到达', 'settings.testNotifyFailed': '发送测试通知失败：{msg}', 'settings.testNotifyUnavailable': '测试通知仅在 App 内可用',
         'settings.peakRemindTitle': '峰谷计费提醒', 'settings.peakRemindDesc': '每天 9:00 / 12:00 / 14:00 / 18:00 推送峰谷切换（App 内有效）',
         'peakRemind.enterPeak': '已进入高峰计费时段', 'peakRemind.enterOff': '已进入空闲计费时段',
         'peakRemind.peak0912': '高峰 9:00-12:00', 'peakRemind.off1214': '空闲 12:00-14:00',
@@ -663,6 +673,7 @@
       en: {
         'a11y.hostAdmin': 'Host admin', 'a11y.refresh': 'Refresh', 'a11y.more': 'More actions', 'a11y.moreTitle': 'Commands / Permissions / Models',
         'conn.on': 'Connected', 'conn.off': 'Offline', 'conn.reconnecting': 'Connection lost, reconnecting…',
+        'conn.reconnectIn': 'Reconnecting {n}s', 'conn.offline': 'Offline', 'conn.failed': 'Connection failed',
         'conn.poll': 'Polling', 'conn.pollTitle': 'Realtime push is unavailable on this network; degraded to polling (a few seconds delay)',
         'conn.titleGroup': '{group} · {url} ({ms})',
         'common.refreshing': 'Refreshing…',
@@ -709,7 +720,7 @@
         'session.confirmStop': 'Stop the currently running task in this session?', 'session.stopFailed': 'Stop failed', 'session.stopRequested': 'Stop requested',
         'notify.approvalTitle': 'Tool approval', 'notify.approvalBody': '{tool} needs approval', 'notify.questionTitle': 'DSH question', 'notify.questionBody': 'Needs your answer',
         'notify.permissionFailed': 'Notification permission failed: {msg}',
-        'history.loading': 'Loading history…', 'history.cacheFallback': 'Network unavailable: showing cached history', 'history.loadFailed': 'Failed to load history: {msg}',
+        'history.loading': 'Loading history…', 'history.cacheFallback': 'Network unavailable: showing cached history', 'history.loadFailed': 'Failed to load history: {msg}', 'history.retry': 'Retry',
         'history.offlineCache': 'Offline cache {n} items', 'history.count': '{n} items', 'history.empty': 'No messages yet',
         'history.queueAndCount': 'Queue {q} · History {n}', 'history.countOnly': 'History {n}',
         'role.me': 'Me', 'role.dsh': 'DSH',
@@ -789,6 +800,8 @@
         'settings.servers': 'Servers (one or more)', 'settings.speedTest': 'Test', 'settings.add': 'Add',
         'settings.scanTitle': 'Scan to pair', 'settings.scanDesc': 'Photo/gallery QR decoding on device (no Google services); system camera or manual paste also work', 'settings.scan': 'Scan',
         'settings.notifyTitle': 'Notifications', 'settings.notifyDesc': 'Push on approvals / questions',
+        'settings.testNotifyTitle': 'Test notification', 'settings.testNotifyDesc': 'Schedule a local notification in 3 seconds to verify the notification pipeline', 'settings.testNotify': 'Send test notification',
+        'settings.testNotifySent': 'Test notification scheduled, arriving in 3s', 'settings.testNotifyFailed': 'Failed to send test notification: {msg}', 'settings.testNotifyUnavailable': 'Test notification is only available in the app',
         'settings.peakRemindTitle': 'Peak/off-peak reminders', 'settings.peakRemindDesc': 'Push at 9:00 / 12:00 / 14:00 / 18:00 daily (in-app only)',
         'peakRemind.enterPeak': 'Peak pricing period started', 'peakRemind.enterOff': 'Off-peak pricing period started',
         'peakRemind.peak0912': 'Peak 9:00-12:00', 'peakRemind.off1214': 'Off-peak 12:00-14:00',
@@ -845,6 +858,7 @@
   <script src="jsqr.min.js"></script>
   <script src="i18n.js"></script>
   <script src="theme.js"></script>
+  <script src="md.js"></script>
   <script src="app.js"></script>
 </body>
 </html>

package/public/md.js

@@ -0,0 +1,115 @@
+/* DSH Remote 轻量 Markdown 渲染器 · 零依赖
+ * 用法: mdToHtml(text) -> HTML 字符串
+ * 安全: 先 HTML 转义再转标记; 链接仅允许 http/https, 其余保留为纯文本。
+ * 支持: 代码块 / 行内代码 / #~### 标题 / **粗体** / *斜体* / - 无序列表 /
+ *       1. 有序列表 / > 引用 / [text](url) 链接 / 换行。
+ * 同时支持浏览器全局 window.mdToHtml 与 Node CommonJS module.exports。
+ */
+(function (root, factory) {
+  if (typeof module === 'object' && module.exports) module.exports = factory()
+  else root.mdToHtml = factory()
+})(typeof self !== 'undefined' ? self : this, function () {
+  'use strict'
+
+  function escapeHtml(s) {
+    return String(s).replace(/[&<>"']/g, function (c) {
+      return {
+        '&': '&amp;',
+        '<': '&lt;',
+        '>': '&gt;',
+        '"': '&quot;',
+        "'": '&#39;'
+      }[c]
+    })
+  }
+
+  function inline(s) {
+    s = s.replace(/`([^`]+)`/g, '<code>$1</code>')
+    s = s.replace(/\*\*([^*]+)\*\*/g, '<strong>$1</strong>')
+    s = s.replace(/(^|[^*])\*([^*\n]+)\*/g, '$1<em>$2</em>')
+    s = s.replace(/\[([^\]]+)\]\(([^)\s]+)\)/g, function (m, text, url) {
+      url = url.trim()
+      if (!/^https?:\/\//i.test(url)) return m
+      return '<a href="' + url + '" target="_blank" rel="noopener noreferrer">' + text + '</a>'
+    })
+    return s
+  }
+
+  function renderLines(lines) {
+    var html = ''
+    var i = 0
+    while (i < lines.length) {
+      var line = lines[i]
+      var t = line.trim()
+      if (!t) { i++; continue }
+      var h = line.match(/^(#{1,3})\s+(.*)$/)
+      if (h) {
+        var level = h[1].length
+        html += '<h' + level + '>' + inline(h[2]) + '</h' + level + '>'
+        i++
+        continue
+      }
+      var q = line.match(/^&gt;\s?(.*)$/)
+      if (q) {
+        html += '<blockquote>' + inline(q[1]) + '</blockquote>'
+        i++
+        continue
+      }
+      var ul = line.match(/^[-*]\s+(.*)$/)
+      if (ul) {
+        var items = []
+        while (i < lines.length) {
+          var um = lines[i].match(/^[-*]\s+(.*)$/)
+          if (!um) break
+          items.push(inline(um[1]))
+          i++
+        }
+        html += '<ul>' + items.map(function (x) { return '<li>' + x + '</li>' }).join('') + '</ul>'
+        continue
+      }
+      var ol = line.match(/^\d+[.)]\s+(.*)$/)
+      if (ol) {
+        var oitems = []
+        while (i < lines.length) {
+          var om = lines[i].match(/^\d+[.)]\s+(.*)$/)
+          if (!om) break
+          oitems.push(inline(om[1]))
+          i++
+        }
+        html += '<ol>' + oitems.map(function (x) { return '<li>' + x + '</li>' }).join('') + '</ol>'
+        continue
+      }
+      var para = []
+      while (i < lines.length) {
+        var cur = lines[i]
+        var ct = cur.trim()
+        if (!ct) break
+        if (/^(#{1,3})\s+/.test(cur) || /^&gt;\s?/.test(cur) || /^[-*]\s+/.test(cur) || /^\d+[.)]\s+/.test(cur)) break
+        para.push(inline(cur))
+        i++
+      }
+      if (para.length) html += '<p>' + para.join('<br>') + '</p>'
+    }
+    return html
+  }
+
+  function mdToHtml(text) {
+    var raw = String(text == null ? '' : text)
+    var parts = raw.split(/```/)
+    var out = ''
+    for (var i = 0; i < parts.length; i++) {
+      if (i % 2 === 1) {
+        var code = parts[i]
+        code = code.replace(/^\n/, '')
+        if (code.slice(-1) === '\n') code = code.slice(0, -1)
+        out += '<pre><code>' + escapeHtml(code) + '</code></pre>'
+      } else {
+        var escaped = escapeHtml(parts[i])
+        out += renderLines(escaped.split('\n'))
+      }
+    }
+    return out
+  }
+
+  return mdToHtml
+})

package/public/styles.css

@@ -298,6 +298,12 @@ body.in-session .view {
 .msg p:first-child { margin-top: 0; } .msg p:last-child { margin-bottom: 0; }
 .msg ul, .msg ol { margin: 4px 0; padding-left: 20px; }
 .msg code { font-family: ui-monospace, monospace; font-size: .9em; background: var(--dsr-accent-soft); padding: 0 4px; border-radius: 4px; }
+.msg h1, .msg h2, .msg h3 { margin: 8px 0 4px; line-height: 1.3; font-weight: 700; }
+.msg h1 { font-size: 1.3em; } .msg h2 { font-size: 1.18em; } .msg h3 { font-size: 1.05em; }
+.msg blockquote { margin: 6px 0; padding: 2px 10px; border-left: 3px solid var(--dsr-accent-2); color: var(--dsr-muted); }
+.msg a { color: var(--dsr-accent-strong); text-decoration: underline; word-break: break-all; }
+.msg.user a { color: var(--dsr-on-accent); }
+.msg li { margin: 2px 0; }
 
 .event {
   align-self: center; font-size: 11px; color: var(--dsr-muted);
@@ -454,6 +460,7 @@ body.in-session .main { padding-bottom: 84px; }
 .setting-name { font-size: 14.5px; font-weight: 600; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
 .setting-desc { font-size: 12px; color: var(--dsr-muted); margin-top: 2px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
 .setting-desc.expanded { white-space: normal; overflow: visible; text-overflow: clip; word-break: break-word; }
+.setting-actions { display: flex; gap: 6px; flex-wrap: wrap; justify-content: flex-end; }
 .about { text-align: center; color: var(--dsr-muted); font-size: 12px; margin-top: 16px; line-height: 1.8; }
 
 /* 多服务器列表(分组) */

package/public/update.json

@@ -1,10 +1,18 @@
 {
-  "version": "0.6.3",
+  "version": "0.6.5",
   "apkUrl": "dsh-remote.apk",
-  "sha256": "e658387db7cee1e0b5392fad3719056b463d40ce55b5aac0d313d797c07438f2",
-  "releasedAt": "2026-08-19T03:20:39.386Z",
-  "notes": "修复 DSH 重启后网关 upstream 端口不刷新（Issue #1）：/health 增加 upstream/upstreamOk/pid 探测；插件 ensureGateway 检测上游变化或不可达时自动杀旧网关并按新 DSH_UPSTREAM 重启；启动/刷新写插件日志与 PID 文件。",
+  "sha256": "132da02e3b5cb2b348f71cdc88590430fdc88abe6ee764788f658372c239e317",
+  "releasedAt": "2026-08-19T12:12:05.411Z",
+  "notes": "连接稳定性全面优化：25 秒心跳保活（WiFi 切换 / NAT 超时不再假活）；60 秒无消息自动重连，指数退避重连（1s → 30s 上限 + 抖动）；网关死连接自动清理（60 秒无数据双向销毁）；断网自动检测与恢复（离线 / 重连中倒计时 / 连接失败状态可见）；降级轮询恢复优化。",
   "history": [
+    {
+      "version": "0.6.5",
+      "notes": "连接稳定性全面优化：25 秒心跳保活（WiFi 切换 / NAT 超时不再假活）；60 秒无消息自动重连，指数退避重连（1s → 30s 上限 + 抖动）；网关死连接自动清理（60 秒无数据双向销毁）；断网自动检测与恢复（离线 / 重连中倒计时 / 连接失败状态可见）；降级轮询恢复优化。"
+    },
+    {
+      "version": "0.6.4",
+      "notes": "扫码配对改为显式双按钮（拍照/相册），修复小米等 ROM 选择器错乱；会话历史加载超时放宽至 45 秒，失败可重试；网关端口自定义（插件管理页可改，环境变量仍优先）+ 启动前端口占用检测；峰谷计费提醒改前台服务驱动，后台按时必达；消息 Markdown 渲染（标题/代码块/列表/链接）；修复 DSH 重启后网关上游端口不刷新（Issue #1）；新增测试通知按钮。"
+    },
     {
       "version": "0.6.3",
       "notes": "修复 DSH 重启后网关 upstream 端口不刷新（Issue #1）：/health 增加 upstream/upstreamOk/pid 探测；插件 ensureGateway 检测上游变化或不可达时自动杀旧网关并按新 DSH_UPSTREAM 重启；启动/刷新写插件日志与 PID 文件。"

package/public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.6.3"
+  "version": "0.6.5"
 }