dsh-remote-plugin 0.6.7 → 0.6.9

package/index.mjs

@@ -151,7 +151,12 @@ function runExit(cmd, args) {
 const GATEWAY_ENV_KEYS = [
   'TOKEN', 'TOKEN_FILE', 'DSH_REMOTE_TOKEN', 'DSH_REMOTE_FS_ROOT', 'DSH_REMOTE_FS_MAX_UPLOAD',
   'DSH_REMOTE_NOTES', 'DSH_REMOTE_WORKBENCH', 'DSH_REMOTE_DSH_SERVICE', 'DSH_REMOTE_FEEDBACK_URL',
-  'UPDATE_CHECK_URL', 'UPDATE_INTERVAL_MS', 'UPDATE_PROXY', 'GATEWAY_WS_IDLE_MS',
+  'UPDATE_CHECK_URL', 'UPDATE_INTERVAL_MS', 'UPDATE_PROXY', 'DSH_HEALTH_PATH',
+  'GATEWAY_WS_IDLE_MS', 'GATEWAY_WS_PING_MS', 'GATEWAY_WS_PONG_TIMEOUT_MS',
+  'GATEWAY_WS_UPGRADE_TIMEOUT_MS', 'GATEWAY_UPSTREAM_TIMEOUT_MS', 'GATEWAY_EVENT_BUFFER_MAX',
+  'GATEWAY_WS_TICKET_TTL_MS',
+  'GATEWAY_HTTP_REQUEST_TIMEOUT_MS', 'GATEWAY_HTTP_HEADERS_TIMEOUT_MS', 'GATEWAY_HTTP_KEEPALIVE_TIMEOUT_MS',
+  'DSH_REMOTE_CORS_ORIGINS',
   'HTTP_PROXY', 'HTTPS_PROXY', 'ALL_PROXY', 'NO_PROXY',
   'http_proxy', 'https_proxy', 'all_proxy', 'no_proxy'
 ]
@@ -194,6 +199,9 @@ async function gatewayRunning() {
       version: typeof data.version === 'string' ? data.version : '',
       upstream: typeof data.upstream === 'string' ? data.upstream : '',
       upstreamOk: data.upstreamOk === true,
+      upstreamReachable: data.upstreamReachable !== false,
+      upstreamStatus: Number(data.upstreamStatus) || 0,
+      upstreamProbe: typeof data.upstreamProbe === 'string' ? data.upstreamProbe : '',
     }
   } catch {
     return { running: false }
@@ -344,7 +352,9 @@ function ensureGateway() {
       const oldUpstream = health.upstream || ''
       const oldVersion = health.version || '?'
       const versionMismatch = oldVersion !== version
-      if (versionMismatch || health.upstreamOk === false || (oldUpstream && oldUpstream !== upstream) || (!oldUpstream && upstream)) {
+      // 上游暂时不可达不应重启网关: VPN/DSH 重启/短暂网络抖动时，
+      // 重启只能制造额外断线，网关应保持运行并通过 /health 暴露 degraded 状态。
+      if (versionMismatch || (oldUpstream && oldUpstream !== upstream) || (!oldUpstream && upstream)) {
         logGateway(`网关需刷新: 版本 ${oldVersion} -> ${version}, 上游 ${oldUpstream || '?'} -> ${upstream}`)
         await killGateway(health)
         for (let i = 0; i < 10; i++) {

package/package.json

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

package/public/admin.html

@@ -145,7 +145,7 @@
       padding: 7px 8px; border-radius: 10px; border: none; background: transparent; color: var(--dsr-text);
       font: inherit; font-size: 13px; text-align: left; cursor: pointer; text-decoration: none;
     }
-    .fb-item:hover, .fb-item:focus-visible { background: var(--dsr-bg); outline: none; }
+    .fb-item:hover, .fb-item:focus-visible { background: var(--dsr-bg); }
     .fb-item.primary { background: var(--dsr-accent-soft); border: 1px solid var(--dsr-accent-line); }
     .fb-ico {
       width: 32px; height: 32px; border-radius: 9px; flex-shrink: 0;
@@ -174,6 +174,86 @@
       .admin-title .right { gap: 4px; }
       .tb-btn { padding: 0 8px; }
     }
+    .login-card input:focus-visible, .gateway-port-row input:focus-visible {
+      outline: 2px solid var(--dsr-accent);
+      outline-offset: 2px;
+    }
+    @media (prefers-reduced-motion: reduce) {
+      *, *::before, *::after {
+        animation-duration: .01ms !important;
+        animation-iteration-count: 1 !important;
+        transition-duration: .01ms !important;
+      }
+    }
+
+    /* 控制台面板：减少整面纯色，建立“工具台”层次 */
+    html, body { font-family: system-ui, -apple-system, "PingFang SC", "Noto Sans CJK SC", sans-serif; text-rendering: optimizeLegibility; }
+    body { background: radial-gradient(900px 520px at 92% -12%, var(--dsr-accent-soft), transparent 68%), linear-gradient(180deg, var(--dsr-bg), var(--dsr-bg-2)); }
+    .admin-wrap { max-width: 1320px; padding: calc(env(safe-area-inset-top, 0px) + 18px) clamp(14px, 3vw, 30px) 48px; }
+    .admin-title { margin-bottom: 18px; padding: 12px 14px; border: 1px solid var(--dsr-line); border-radius: 18px; background: linear-gradient(135deg, var(--dsr-panel), var(--dsr-bg-2)); box-shadow: 0 14px 36px var(--dsr-shadow); backdrop-filter: blur(16px); }
+    .admin-title h1 { font-size: 21px; letter-spacing: -.2px; }
+    .admin-title .left, .admin-title .right { gap: 7px; }
+    .tb-btn { border-radius: 11px; background: linear-gradient(135deg, var(--dsr-panel-2), var(--dsr-bg-2)); border-color: var(--dsr-line); transition: transform .18s ease, border-color .18s ease, background .18s ease; }
+    .tb-btn:hover { transform: translateY(-1px); border-color: var(--dsr-accent-line); background: var(--dsr-accent-soft); }
+    .tb-btn svg { width: 17px; height: 17px; }
+    .login-card, .stat-card, .stats-chart, .table-wrap, .gateway-port-row, .pair-box { background: linear-gradient(145deg, var(--dsr-panel), var(--dsr-bg-2)); border-color: var(--dsr-line); border-radius: 18px; box-shadow: 0 12px 30px var(--dsr-shadow); }
+    .login-card { padding: 18px; }
+    .stat-grid { gap: 12px; }
+    .stat-card { padding: 15px 16px; box-shadow: inset 0 1px var(--dsr-divider), 0 10px 26px var(--dsr-shadow); }
+    .stat-card .v { font-size: 24px; font-variant-numeric: tabular-nums; }
+    .stats-dash { margin-top: 4px; }
+    .stats-chart { height: 210px; padding: 16px 18px 12px; }
+    .stats-bar .bars { border-radius: 9px 9px 3px 3px; box-shadow: 0 0 16px var(--dsr-glow); }
+    .section-head { margin: 18px 2px 9px; font-weight: 750; letter-spacing: .2px; }
+    .token-row { display: grid; grid-template-columns: minmax(0, 1fr) auto; align-items: center; gap: 12px; padding: 13px; margin: 0 0 14px; border: 1px solid var(--dsr-line); border-radius: 18px; background: linear-gradient(145deg, var(--dsr-panel), var(--dsr-bg-2)); box-shadow: 0 10px 28px var(--dsr-shadow); }
+    .token-row code { width: auto; min-width: 0; padding: 10px 12px; border-radius: 11px; background: var(--dsr-bg); border-color: var(--dsr-line); }
+    .token-actions { justify-content: flex-end; }
+    .token-actions .mini-btn { flex: 0 0 auto; border-radius: 10px; }
+    .gateway-port-row { padding: 12px 14px; }
+    .table-wrap { overflow: hidden; }
+    th, td { border-bottom-color: var(--dsr-divider); }
+    tbody tr { transition: background .18s ease; }
+    .pair-box { padding: 18px; }
+    .admin-hero { display:flex; align-items:flex-end; justify-content:space-between; gap:18px; padding:20px; margin:0 0 16px; border:1px solid var(--dsr-accent-line); border-radius:20px; background:linear-gradient(135deg, var(--dsr-panel-2), var(--dsr-bg-2)); box-shadow:0 16px 34px var(--dsr-shadow); }
+    .admin-hero-copy { min-width:0; }
+    .admin-eyebrow { color:var(--dsr-accent-strong); font-size:10px; font-weight:800; letter-spacing:1.6px; }
+    .admin-hero h2 { margin:7px 0 4px; font-size:26px; line-height:1.15; letter-spacing:-.5px; }
+    .admin-hero p { margin:0; color:var(--dsr-muted); font-size:12px; }
+    .admin-hero-side { display:flex; flex-direction:column; align-items:flex-end; gap:10px; flex:none; }
+    .admin-hero-status { color:var(--dsr-success); font-size:12px; font-weight:700; }
+    .admin-hero.attention { border-color:var(--dsr-warning-line); }
+    .admin-hero.attention .admin-hero-status { color:var(--dsr-warning); }
+    .admin-hero.plugin, .admin-hero.offline { border-color:var(--dsr-line); }
+    .admin-hero.plugin .admin-hero-status, .admin-hero.offline .admin-hero-status { color:var(--dsr-muted); }
+    .admin-hero-action { min-height:36px; padding:7px 13px; border-color:var(--dsr-accent-strong); background:var(--dsr-accent-strong); color:var(--dsr-on-accent); font-weight:700; }
+    .admin-hero.plugin .admin-hero-action { border-color:var(--dsr-accent-strong); background:var(--dsr-accent-strong); }
+    .admin-hero.offline .admin-hero-action { border-color:var(--dsr-accent-line); background:var(--dsr-accent-soft); color:var(--dsr-accent-strong); }
+    #stats { grid-template-columns:repeat(4,minmax(0,1fr)); }
+    #stats .stat-card:nth-child(n+5) { background:transparent; box-shadow:none; }
+    #stats .stat-card:nth-child(n+5) .v { font-size:20px; }
+    @media (max-width: 760px) {
+      .admin-hero { align-items:stretch; flex-direction:column; gap:14px; padding:16px; }
+      .admin-hero h2 { font-size:23px; }
+      .admin-hero-side { align-items:stretch; flex-direction:row; justify-content:space-between; }
+      .admin-hero-action { flex:0 0 auto; }
+      #stats { grid-template-columns:repeat(2,minmax(0,1fr)); }
+      #stats .stat-card:nth-child(n+5) { background:linear-gradient(145deg, var(--dsr-panel), var(--dsr-bg-2)); box-shadow:inset 0 1px var(--dsr-divider), 0 10px 26px var(--dsr-shadow); }
+    }
+    @media (max-width: 720px) {
+      .token-row { display: flex; flex-direction: column; align-items: stretch; }
+      .token-actions { justify-content: stretch; }
+      .token-actions .mini-btn { flex: 1 1 auto; }
+    }
+    @media (max-width: 900px) {
+      .admin-title { display: grid; grid-template-columns: minmax(0, 1fr) auto; row-gap: 10px; }
+      .admin-title .left { min-width: 0; }
+      .admin-title .right { grid-column: 1 / -1; justify-content: flex-start; min-width: 0; overflow-x: auto; scrollbar-width: none; }
+      .admin-title .right::-webkit-scrollbar { display: none; }
+    }
+    @media (max-width: 440px) {
+      .admin-title h1 { display: block; min-width: 0; overflow: visible; font-size: 18px; }
+      .admin-title .left { gap: 7px; }
+    }
   </style>
 </head>
 <body>
@@ -185,11 +265,11 @@
         <h1>DSH Remote <span data-i18n="admin">管理</span></h1>
       </div>
       <div class="right">
-        <a class="mini-btn gh-btn tb-btn" href="https://github.com/Blank-not-black/dsh-Remote" target="_blank" rel="noopener" title="GitHub">
+        <a class="mini-btn gh-btn tb-btn" href="https://github.com/Blank-not-black/dsh-Remote" target="_blank" rel="noopener" title="GitHub" data-i18n-aria="repo">
           <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>
+        <button id="btn-donate" class="mini-btn tb-btn" data-i18n-title="donateTitle" data-i18n-aria="donateTitle"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M6 8h11v6a4 4 0 0 1-4 4H10a4 4 0 0 1-4-4Z"/><path d="M17 10h1.5a2.5 2.5 0 0 1 0 5H17M9 4c0 1 1 1.2 1 2M13 4c0 1 1 1.2 1 2M5 20h13"/></svg></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>
@@ -223,6 +303,18 @@
     </div>
 
     <div id="main-view" class="hidden">
+      <section id="admin-hero" class="admin-hero" aria-live="polite">
+        <div class="admin-hero-copy">
+          <div class="admin-eyebrow" data-i18n="hero.eyebrow">GATEWAY CONTROL</div>
+          <h2 id="admin-hero-title">正在检查网关</h2>
+          <p id="admin-hero-desc">读取运行状态与上游连接</p>
+        </div>
+        <div class="admin-hero-side">
+          <span id="admin-hero-status" class="admin-hero-status">—</span>
+          <button id="admin-hero-action" class="mini-btn admin-hero-action" type="button" data-i18n="hero.openDevices">查看设备</button>
+        </div>
+      </section>
+
       <div class="token-row">
         <code id="token-full">—</code>
         <div class="token-actions">
@@ -274,7 +366,7 @@
   </div>
 
   <!-- 皮肤选择模态 -->
-  <div id="modal-theme" class="modal hidden">
+  <div id="modal-theme" class="modal hidden" role="dialog" aria-modal="true">
     <div class="modal-card">
       <div class="modal-title" data-i18n="theme.panelTitle">选择配色</div>
       <div id="theme-options" class="theme-panel-list"></div>
@@ -285,11 +377,11 @@
   </div>
 
   <!-- 赞赏支持模态 -->
-  <div id="modal-donate" class="modal hidden">
+  <div id="modal-donate" class="modal hidden" role="dialog" aria-modal="true">
     <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">
+        <img src="../donate.png" alt="赞赏二维码" width="1152" height="1152" class="donate-img" style="display:block;margin:0 auto;max-width:100%;height:auto;max-height:60vh;border-radius:12px">
         <p class="donate-thanks" data-i18n="donateThanks" style="text-align:center;margin-top:12px">感谢你的支持 ☕</p>
       </div>
       <div class="modal-actions">
@@ -298,7 +390,7 @@
     </div>
   </div>
 
-  <div id="toast" class="toast hidden"></div>
+  <div id="toast" class="toast hidden" role="status" aria-live="polite"></div>
   <script>
     window.ADMIN_STR = {
       zh: {
@@ -306,6 +398,8 @@
         'consoleTitle': '返回控制台',
         'collapse': '收起面板',
         'admin': '管理',
+        'hero.eyebrow': 'GATEWAY CONTROL', 'hero.running': '网关运行正常', 'hero.attention': '网关需要关注', 'hero.plugin': 'DSH 插件已连接', 'hero.offline': '网关未运行', 'hero.checking': '正在检查网关',
+        'hero.runningDesc': '{online} 台设备在线 · {requests} 次请求', 'hero.attentionDesc': 'DSH 上游暂时不可达，请打开诊断', 'hero.pluginDesc': '插件已连接 DSH，网关可按需启动', 'hero.offlineDesc': '启动网关后即可接受 App 和桌面端连接', 'hero.openDevices': '查看设备', 'hero.startGateway': '启动网关', 'hero.copyToken': '复制令牌',
         'theme.default': '默认深空', 'theme.dark': '落日', 'theme.light': '易北爱乐厅', 'theme.neutral': '草原孤塔',
         'theme.panelTitle': '选择配色', 'theme.close': '关闭',
         'repo': '仓库',
@@ -389,6 +483,8 @@
         'consoleTitle': 'Back to console',
         'collapse': 'Collapse panel',
         'admin': 'Admin',
+        'hero.eyebrow': 'GATEWAY CONTROL', 'hero.running': 'Gateway is healthy', 'hero.attention': 'Gateway needs attention', 'hero.plugin': 'DSH plugin connected', 'hero.offline': 'Gateway is not running', 'hero.checking': 'Checking gateway',
+        'hero.runningDesc': '{online} devices online · {requests} requests', 'hero.attentionDesc': 'DSH upstream is unreachable; open diagnostics', 'hero.pluginDesc': 'The plugin is connected to DSH; start the gateway when needed', 'hero.offlineDesc': 'Start the gateway to accept App and desktop connections', 'hero.openDevices': 'View devices', 'hero.startGateway': 'Start gateway', 'hero.copyToken': 'Copy token',
         'theme.default': 'Default', 'theme.dark': 'Sunset', 'theme.light': 'Elbphilharmonie', 'theme.neutral': 'Prairie Tower',
         'theme.panelTitle': 'Choose theme', 'theme.close': 'Close',
         'repo': 'Repo',

package/public/admin.js

@@ -220,6 +220,24 @@ function render(st) {
     if (cur) cur.textContent = t('gatewayPort.current', { port: gatewayPort })
   }
   const upOk = st.upstream.reachable
+  const hero = $('admin-hero')
+  if (hero) {
+    const heroState = isGateway ? (upOk ? 'running' : 'attention') : isPlugin ? 'plugin' : 'offline'
+    hero.className = 'admin-hero ' + heroState
+    const titleKey = heroState === 'running' ? 'hero.running' : heroState === 'attention' ? 'hero.attention' : heroState === 'plugin' ? 'hero.plugin' : 'hero.offline'
+    const descKey = heroState === 'running' ? 'hero.runningDesc' : heroState === 'attention' ? 'hero.attentionDesc' : heroState === 'plugin' ? 'hero.pluginDesc' : 'hero.offlineDesc'
+    $('admin-hero-title').textContent = t(titleKey)
+    $('admin-hero-desc').textContent = heroState === 'running'
+      ? t(descKey, { online: st.onlineCount || 0, requests: st.totalRequests || 0 })
+      : t(descKey)
+    $('admin-hero-status').textContent = isGateway ? (upOk ? t('stat.reachable') : t('stat.unreachable')) : t(isPlugin ? 'badge.embedded' : 'badge.gatewayDown')
+    const action = $('admin-hero-action')
+    if (action) {
+      const actionKey = heroState === 'plugin' ? 'hero.startGateway' : heroState === 'offline' ? 'hero.copyToken' : 'hero.openDevices'
+      action.textContent = t(actionKey)
+      action.dataset.heroAction = heroState === 'plugin' ? 'start' : heroState === 'offline' ? 'copy' : 'devices'
+    }
+  }
   const hostIPs = (st.lanIPs || []).join(t('stat.ipSep')) || '127.0.0.1'
   const latestHtml = st.latest?.newer
     ? `<div class="v">${t('stat.updateAvailable', { version: st.latest.version })}</div><div class="k">${t('stat.currentV', { version: st.version })} · <a href="${st.latest.url || '#'}" target="_blank" rel="noopener" style="color:var(--dsr-accent-strong)">${t('stat.download')}</a></div>`
@@ -388,6 +406,12 @@ $('btn-logout').addEventListener('click', logout)
 $('btn-close-drawer').addEventListener('click', () => {
   window.parent.postMessage({ source: 'dsh-remote-admin', type: 'close' }, location.origin)
 })
+$('admin-hero-action').addEventListener('click', () => {
+  const action = $('admin-hero-action').dataset.heroAction
+  if (action === 'start') return $('btn-gateway').click()
+  if (action === 'copy') return $('btn-copy').click()
+  $('device-rows').closest('.table-wrap')?.scrollIntoView({ behavior: 'smooth', block: 'start' })
+})
 $('btn-copy').addEventListener('click', async () => {
   try {
     await navigator.clipboard.writeText(shownToken || token)

package/public/announcements.json

@@ -0,0 +1,12 @@
+{
+  "items": [
+    {
+      "id": "2026-08-21-community-test",
+      "title": "dsh-Remote 测试公告",
+      "content": "这是一条测试公告，如果您已经更新了新版的 dsh-Remote，您将收到这份公告。之后一些内容将会以实时公告的形式发布。\n\n非常遗憾的是，之前在 App 内直接反馈的内容由于当时服务器接收端配置问题，导致没有留下记录。如果您对 dsh-Remote 的后续更新与维护有更好的建议或者反馈，可以通过标题栏中的反馈渠道联系我，我会对反馈内容进行评估后对插件功能进行改善，感谢各位开发者的支持。\n\n同时也非常感谢“品”同学的赞赏，大学生个人开发不易，还请大家多多支持！",
+      "minVersion": "0.6.7",
+      "maxVersion": "",
+      "publishedAt": "2026-08-21T15:00:00+08:00"
+    }
+  ]
+}