dsh-mobile-plugin 0.2.2 → 0.3.1

package/dsh-mobile-credentials/lib/credentials.js

@@ -269,8 +269,21 @@ function touch(record, info = {}) {
   record.lastSeenAt = now;
   const channel = typeof info.channel === 'string' ? info.channel : '';
   if (channel) record.lastChannel = channel.slice(0, FIELD_MAX);
+  // 身份那几格（2026-10-26）：名字 / 平台 / 系统版本 / App 版本由**每一次请求**带上来，
+  // 顺手刷新。它们以前只在配对那一刻写一次，于是「手机升到新版了、面板还报配对时的旧版本」，
+  // 而旧会话升级写进来的记录干脆什么身份都没有（面板只能画「未知设备」）。
+  // **只写这次真带了值的格子**：老版本 App 不带头，绝不能把已经有的名字冲成空。
+  const meta = deviceMeta(info.meta);
+  let metaChanged = false;
+  for (const key of Object.keys(meta)) {
+    if (record[key] !== meta[key]) {
+      record[key] = meta[key];
+      metaChanged = true;
+    }
+  }
   if (readOnly) return true;
-  if (now - lastTouchFlushAt < TOUCH_FLUSH_MS) return true;
+  // 身份变了必须落盘（那是面板唯一能看到的来源）；只刷新「刚连上过」才走老的一分钟节流。
+  if (!metaChanged && now - lastTouchFlushAt < TOUCH_FLUSH_MS) return true;
   lastTouchFlushAt = now;
   save();
   return true;

package/lib/impl.js

@@ -24,6 +24,7 @@ const { authorized, authOutcome, presentedCredential } = require('./mobile/auth.
 const { readRawBody } = require('./shared/e2ee-request')
 const streamRegistry = require('./mobile/stream-registry.js')
 const { viaChannel } = require('./shared/via-header')
+const { deviceMetaFromHeaders } = require('./shared/device-headers.js')
 const { createSidecarLifecycle } = require('./sidecar-lifecycle.cjs')
 const { createMirrorPusher } = require('./mirror/pusher.cjs')
 const { randomBytes } = require('node:crypto')
@@ -424,12 +425,11 @@ function apply(ctx) {
     readBody: (req) => readRawBody(req),
   }
   const guarded = createGuarded(ctx, authOutcome, activity.note, {
-    // 鉴权通过后立刻记「最近连接 + 走的是哪条路」：两条代理都注入了 `x-dsh-via`。
     onAuthorized: (req) => {
       const presented = presentedCredential(req)
       if (!presented) return
       const record = credentials.lookup(presented, state.instanceId)
-      if (record) credentials.touch(record, { channel: viaChannel(req) })
+      if (record) credentials.touch(record, { channel: viaChannel(req), meta: deviceMetaFromHeaders(req) })
     },
     envelope,
   })

package/lib/mobile/credential-upgrade.js

@@ -113,6 +113,30 @@ async function handleCredentialUpgrade(req, res, deps) {
     });
   }
 
+  // 同一个 keyId 已经登记过一枚（上一次的响应可能在路上丢了，手机又发了一遍）：
+  // **不再签发第二条** —— 手机留着手上这枚凭据、按 v2 签名，宿主按 keyId 验签，链路照样通。
+  // 没有这一条时每次重试都往库里堆一条记录（实测同一台设备 54 分钟里堆了 39 条，
+  // 面板上于是出现一堆同名的行）。
+  const known = presented && typeof store.findByKeyId === 'function'
+    ? store.findByKeyId(instanceId, secret.keyId)
+    : null;
+  if (known) {
+    store.touch(known, { channel: 'upgrade', meta: { ...meta, deviceId: known.deviceId } });
+    return sendJson(res, 200, {
+      ok: true,
+      upgraded: true,
+      proto: 2,
+      instanceId,
+      token: presented,
+      cookie: `dsh_lan=${presented}`,
+      deviceCredential: presented,
+      keyId: known.keyId,
+      deviceId: known.deviceId,
+      credentialExpiresAt: known.expiresAt || null,
+      serverTime: Date.now(),
+    });
+  }
+
   const issued = store.issue(instanceId, { ...meta, deviceId }, '', undefined, {
     deviceKey: secret.deviceKey,
     keyId: secret.keyId,