dsh-remote-plugin 0.6.13 → 0.6.14

package/gateway.cjs

@@ -400,7 +400,8 @@ function issueWsTicket(auth) {
 }
 
 // ---------- 设备监控 ----------
-const devices = new Map()   // ip -> device
+const devices = new Map()   // ip[|clientId] -> device
+const legacyDeviceAliases = new Map() // ip -> { clientId, ua, expiresAt }
 // 设备 TTL 是“记录保留时间”，和下方 online 判断的 60s 活跃窗口是两回事：
 // online 只看最近 60s 是否有请求；TTL 用于防止长期运行的网关内存/响应无限膨胀。
 const DEVICE_TTL_MS = 24 * 60 * 60 * 1000
@@ -417,6 +418,9 @@ function pruneDevices(now = Date.now()) {
   for (const [ip, d] of devices) {
     if (now - d.lastSeen > DEVICE_TTL_MS) devices.delete(ip)
   }
+  for (const [ip, alias] of legacyDeviceAliases) {
+    if (!alias || alias.expiresAt <= now) legacyDeviceAliases.delete(ip)
+  }
 }
 
 function loadNotes() {
@@ -444,10 +448,53 @@ function kindOf(req) {
   return 'browser'
 }
 
+function mergeDeviceRecords(target, legacy) {
+  if (!target || !legacy || target === legacy) return
+  target.firstSeen = Math.min(target.firstSeen || Date.now(), legacy.firstSeen || Date.now())
+  target.lastSeen = Math.max(target.lastSeen || 0, legacy.lastSeen || 0)
+  target.requests += legacy.requests || 0
+  target.authFailures += legacy.authFailures || 0
+  target.credentialId ||= legacy.credentialId || ''
+  if (!target.ua || (legacy.ua && legacy.ua.length > target.ua.length)) target.ua = legacy.ua
+  for (const channel of new Set([...Object.keys(legacy.channelCounts || {}), ...Object.keys(target.channelCounts || {})])) {
+    target.channelCounts[channel] = (target.channelCounts[channel] || 0) + (legacy.channelCounts?.[channel] || 0)
+    target.channels[channel] = !!(target.channelCounts[channel] || target.channels[channel] || legacy.channels?.[channel])
+  }
+  for (const socket of legacy.sockets || []) target.sockets.add(socket)
+}
+
+function legacyDeviceFor(ip, clientId, req) {
+  if (!clientId) return null
+  const legacy = devices.get(ip)
+  if (!legacy || legacy.clientId) return null
+  const requestUa = String(req.headers['user-agent'] || '')
+  const sameUa = requestUa && legacy.ua && requestUa === legacy.ua
+  const legacyBackgroundPoll = /^Dalvik\/2\.1\.0/i.test(legacy.ua || '') && req.headers['x-dsh-remote-client'] === 'app'
+  if (!sameUa && !legacyBackgroundPoll) return null
+  return legacy
+}
+
+function knownDeviceForLegacy(ip, req) {
+  const requestUa = String(req.headers['user-agent'] || '')
+  if (!requestUa) return null
+  const candidates = [...devices.values()].filter(d => {
+    if (d.ip !== ip || !d.clientId) return false
+    return (d.ua && d.ua === requestUa) || (d.kind === 'app' && /^Dalvik\/2\.1\.0/i.test(requestUa))
+  })
+  return candidates.length === 1 ? candidates[0] : null
+}
+
 function touchDevice(req, extra = {}) {
   pruneDevices()
   const ip = ipOf(req)
-  const clientId = String(extra.clientId || '').replace(/[^A-Za-z0-9._~-]/g, '').slice(0, 96)
+  const headerClientId = req.headers['x-dsh-remote-client-id']
+  let clientId = String(extra.clientId || headerClientId || '').replace(/[^A-Za-z0-9._~-]/g, '').slice(0, 96)
+  const requestUa = String(req.headers['user-agent'] || '')
+  if (!clientId) {
+    const alias = legacyDeviceAliases.get(ip)
+    if (alias && alias.expiresAt > Date.now() && alias.ua && alias.ua === requestUa) clientId = alias.clientId
+    else clientId = knownDeviceForLegacy(ip, req)?.clientId || ''
+  }
   const deviceKey = clientId ? `${ip}|${clientId}` : ip
   totalRequests++
   let d = devices.get(deviceKey)
@@ -458,6 +505,14 @@ function touchDevice(req, extra = {}) {
     }
     devices.set(deviceKey, d)
   }
+  if (clientId && deviceKey !== ip) {
+    const legacy = legacyDeviceFor(ip, clientId, req)
+    if (legacy && legacy !== d) {
+      mergeDeviceRecords(d, legacy)
+      devices.delete(ip)
+      legacyDeviceAliases.set(ip, { clientId, ua: legacy.ua, expiresAt: Date.now() + DEVICE_TTL_MS })
+    }
+  }
   d.lastSeen = Date.now()
   d.requests++
   if (extra.channel) {
@@ -473,7 +528,7 @@ function touchDevice(req, extra = {}) {
   if (req.dshRemoteAuth?.type === 'device') d.credentialId = req.dshRemoteAuth.id
   const marked = req.headers['x-dsh-remote-client']
   if (marked) d.kind = marked
-  const ua = String(req.headers['user-agent'] || '')
+  const ua = requestUa
   if (ua && ua.length > d.ua.length) d.ua = ua
   return d
 }
@@ -713,7 +768,7 @@ function cors(res, req = res.req) {
   }
   if (allowed) res.setHeader('access-control-allow-origin', origin || '*')
   res.setHeader('vary', 'Origin')
-  res.setHeader('access-control-allow-headers', 'authorization, content-type, x-dsh-remote-client')
+  res.setHeader('access-control-allow-headers', 'authorization, content-type, x-dsh-remote-client, x-dsh-remote-client-id')
   res.setHeader('access-control-allow-methods', 'GET, POST, OPTIONS')
   res.setHeader('access-control-max-age', '600')
 }

package/package.json

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

package/public/announcements.json

@@ -50,6 +50,31 @@
           { "id": "not-used", "label": "尚未使用，暂时无法判断" }
         ]
       }
+    },
+    {
+      "id": "2026-08-24-remote-plugin-demand-poll",
+      "title": "投票：你是否需要远程使用或管理插件？",
+      "content": "我们正在研究将插件管理和插件内具体功能接入 dsh-Remote 的可行性。后续可能由 DSH 端的插件管理工具负责实际处理，再通过远程接口提供给 App 使用。\n\n本投票用于了解大家的实际需求，结果仅作为后续版本规划参考，不代表功能已经确定或会自动执行插件操作。",
+      "minVersion": "0.6.11",
+      "maxVersion": "",
+      "publishedAt": "2026-08-24T23:28:14+08:00",
+      "poll": {
+        "id": "remote-plugin-demand-2026-08",
+        "question": "你更需要哪类远程插件能力？",
+        "options": [
+          { "id": "use-plugin-features", "label": "远程使用插件内具体功能" },
+          { "id": "manage-plugins-only", "label": "只需要远程安装、更新、卸载插件" },
+          { "id": "no-remote-plugin", "label": "没有远程使用或管理插件的需求" }
+        ]
+      }
+    },
+    {
+      "id": "2026-08-25-user-community-group",
+      "title": "dsh-Remote 用户交流群建立公告",
+      "content": "大家好，dsh-Remote 用户交流群已经建立，群号：1106138825。\n\n本群主要用于：\n\n- 用户需求和使用反馈\n- 后续版本更新说明\n- 使用过程中问题的交流与讨论\n\n欢迎有兴趣的用户加入。提交日志或截图前，请注意隐藏 Token、服务器地址等敏感信息。",
+      "minVersion": "",
+      "maxVersion": "",
+      "publishedAt": "2026-08-25T00:24:27+08:00"
     }
   ]
 }