dsh-cindy-host 0.1.23 → 0.1.25

package/CHANGELOG.md

@@ -3,6 +3,23 @@
 本文件记录**用户可见**的变化与**每次发布验证过的 DSH 版本**。格式遵循
 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.1.0/)，版本号遵循语义化版本。
 
+## [0.1.25] - 2026-10-22
+
+### Fixed
+
+- 设备删除遇到令牌过期时使用 Host 共享凭据刷新通道，最多重试一次；保留登录态，并在重试前重新检查设备在线状态。
+- 按上游实际 HTTP 状态区分登录过期、权限、设备不存在、冲突和服务故障，不再统一误报“设备可能已上线”。
+- 删除请求补齐官方客户端使用的 JSON Content-Type；Cindy 兼容版本仍为 0.1.82。
+
+## [0.1.24] - 2026-10-20
+
+### Fixed
+
+- 设置页支持二次确认删除账号中的离线设备；拒绝删除在线设备和当前 Host，删除失败不清除登录态。
+- 设备身份读取失败时停止注册而非生成新身份，并合并并发身份初始化，避免插件制造重复设备。
+- Cindy 兼容版本统一为真实桌面稳定版 0.1.82（2026-09-14），与插件发行版本独立。
+- 基于正式 0.1.23 集成，保留会话删除确认、交互与设置兼容能力。
+
 ## [0.1.23] - 2026-10-14
 
 ### Fixed

package/lib/client.js

@@ -64,7 +64,7 @@ window.__ModuleLoader__.load({
           signIn: "登录",
           signingIn: "登录中…",
           logout: "退出登录",
-          devices: "已连接设备",
+          devices: "账号设备",
           deviceOffline: "离线",
           deviceOnline: "在线",
           unknownPlatform: "未知平台",
@@ -101,7 +101,7 @@ window.__ModuleLoader__.load({
           signIn: "Sign in",
           signingIn: "Signing in…",
           logout: "Sign out",
-          devices: "Connected devices",
+          devices: "Account devices",
           deviceOffline: "offline",
           deviceOnline: "online",
           unknownPlatform: "unknown platform",
@@ -451,7 +451,8 @@ window.__ModuleLoader__.load({
     }
 
     /** One device row: a name the user recognizes plus the id they can quote. */
-    function DeviceRow({ device }) {
+    function DeviceRow({ device, onDelete, busy = false }) {
+      const [confirming, setConfirming] = react.useState(false);
       const online = device.online === true;
       return h(
         "div",
@@ -460,8 +461,15 @@ window.__ModuleLoader__.load({
         h(
           "span",
           { style: styles.deviceMeta },
-          (online ? TEXT.deviceOnline : TEXT.deviceOffline) + " · " + platformText(device.platform) + " · " + device.deviceId,
+          (online ? TEXT.deviceOnline : TEXT.deviceOffline) + " · " + platformText(device.platform) + " · " + device.deviceId + (device.lastSeenAt ? " · " + device.lastSeenAt : ""),
         ),
+        onDelete ? h("div", null,
+          confirming && device.online === false ? h("div", null,
+            h("span", { style: styles.hint }, "从账号中删除此设备？这会移除该设备记录，并非仅隐藏。"),
+            h("button", { type: "button", disabled: busy, onClick: () => onDelete(device.deviceId) }, "确认删除"),
+            h("button", { type: "button", disabled: busy, onClick: () => setConfirming(false) }, "取消"),
+          ) : h("button", { type: "button", disabled: busy || device.online !== false, title: online ? "在线设备不能删除，请先断开" : "删除离线设备", onClick: () => setConfirming(true) }, "删除设备"),
+        ) : null,
       );
     }
 
@@ -533,6 +541,12 @@ window.__ModuleLoader__.load({
           }
         }, [refresh]);
 
+        const onDeleteDevice = (deviceId) => guard(async () => {
+          const result = await postJson("/devices/delete", { deviceId });
+          if (!result.ok) { setError(result.message || "删除失败，请刷新重试"); return; }
+          if (result.status) setStatus(result.status);
+        });
+
         const onSendCode = ({ kind, identifier }) =>
           guard(async () => {
             setNotice(null);
@@ -647,12 +661,12 @@ window.__ModuleLoader__.load({
             "div",
             { style: styles.deviceList },
             h("span", { style: styles.label }, TEXT.devices),
-            view.devices.length > 0 ? view.devices.map((device) => h(DeviceRow, { key: device.deviceId, device })) : h("span", { style: styles.hint }, TEXT.noDevices),
+            view.devices.length > 0 ? view.devices.map((device) => h(DeviceRow, { key: device.deviceId, device, busy, onDelete: view.login.authenticated && device.deviceId !== view.host?.deviceId ? onDeleteDevice : null })) : h("span", { style: styles.hint }, TEXT.noDevices),
             view.host && view.host.deviceId
               ? h(
                   "span",
                   { style: styles.deviceMeta },
-                  TEXT.hostDevice + ": " + (view.host.deviceName || "DSH Host") + " · " + view.host.deviceId,
+                  TEXT.hostDevice + ": " + (view.host.deviceName || "DSH Host") + " · " + view.host.deviceId + (view.host.appVersion ? " · Cindy " + view.host.appVersion : ""),
                 )
               : null,
           ),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-cindy-host",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "private": false,
   "description": "Cindy 手机客户端连接 DSH 的 Host 侧插件：会话/消息/审批/todo/goal 的手机通道，以及配套的设置卡片",
   "license": "MIT",

package/src/host-authorization.js

@@ -14,6 +14,8 @@
  *    which is exactly the trap this file now documents.
  */
 
+import { HOST_APP_VERSION } from './host-version.js';
+
 const CHANNELS = ['device-link:subscribe', 'local-db:sessions:list'];
 
 /**
@@ -43,7 +45,7 @@ export function acceptLink(frame, acceptedControllers, capabilities = HOST_CAPAB
     id: frame.id,
     dst: frame.src,
     payload: {
-      appVersion: '0.1.0',
+      appVersion: HOST_APP_VERSION,
       allowlistHash: computeAllowlistHash(),
       ...(capabilities.length === 0 ? {} : { capabilities: [...capabilities] }),
     },

package/src/host-device-delete.js

@@ -0,0 +1,50 @@
+/** Delete only a known offline peer; credential renewal belongs to the Host owner. */
+export async function deleteAccountDevice({ deviceId, session, snapshot, url, fetchImpl, refreshSession, getSnapshot = () => snapshot }) {
+  const fail = (statusCode, message) => ({ ok: false, statusCode, message });
+  const validate = () => {
+    if (typeof deviceId !== 'string' || !deviceId.trim()) return fail(400, '设备 ID 无效');
+    if (!session?.accessToken) return fail(401, '现有登录态不可用，请检查凭据存储');
+    const current = getSnapshot();
+    if (deviceId === session.deviceId || deviceId === current.host?.deviceId) return fail(409, '不能删除当前主机');
+    const device = current.devices.find(row => row.deviceId === deviceId);
+    if (!device) return fail(404, '设备不在当前列表中，请刷新');
+    if (device.online !== false) return fail(409, '在线设备不能删除，请先将该设备断开');
+    return null;
+  };
+  const invalid = validate();
+  if (invalid) return invalid;
+  try {
+    for (let attempt = 0; attempt < 2; attempt++) {
+      const response = await fetchImpl(url + '/' + encodeURIComponent(deviceId), {
+        method: 'DELETE', headers: { Authorization: 'Bearer ' + session.accessToken, accept: 'application/json', 'Content-Type': 'application/json' },
+        signal: AbortSignal.timeout(15000),
+      });
+      const body = await response.json().catch(() => null);
+      if (response.status === 401 && attempt === 0 && refreshSession) {
+        const renewed = await refreshSession(session);
+        if (renewed) {
+          session = renewed;
+          const invalid = validate();
+          if (invalid) return invalid;
+          continue;
+        }
+      }
+      if (!response.ok) {
+        const messages = {
+          401: '登录态已过期，未删除设备，也未清除凭据',
+          403: '服务拒绝删除：当前账号无权删除此设备',
+          404: '服务未找到该设备，请刷新设备列表',
+          405: '当前服务不支持设备删除接口',
+          409: '服务拒绝删除：设备状态冲突，请刷新设备列表',
+          429: '删除请求过于频繁，请稍后重试',
+        };
+        const code = response.status >= 400 && response.status <= 599 ? response.status : 502;
+        return fail(code, messages[code] ?? ('设备删除服务请求失败（HTTP ' + code + '），请稍后重试'));
+      }
+      if (body?.deleted !== true || body.deviceId !== deviceId) return fail(502, '服务未确认删除，请刷新设备列表');
+      return { ok: true, deviceId, deleted: true };
+    }
+  } catch {
+    return fail(502, '无法确认删除结果，请检查网络并刷新列表');
+  }
+}

package/src/host-routes.js

@@ -79,23 +79,29 @@ export function createHostRoutes({ getRuntime, getDiagnostics, getSettings, reme
    * different device and makes the phone's existing link dangle.
    * @returns the device id to log in with.
    */
+  let pendingDeviceId = null;
+  let fallbackDeviceId = null;
   async function hostDeviceId() {
-    const stored = await loadCredential().catch(() => null);
-    const fromCredential = typeof stored?.deviceId === 'string' ? stored.deviceId.trim() : '';
-    const remembered = typeof getSettings === 'function'
-      ? (() => { try { return rememberedDeviceId(getSettings()); } catch { return ''; } })()
-      : '';
-    const deviceId = fromCredential !== '' ? fromCredential : (remembered !== '' ? remembered : randomUUID());
-    if (deviceId !== remembered && typeof rememberDeviceId === 'function') {
-      // Remembering is best effort: a settings write that fails must not cost the
-      // login the user is in the middle of.
-      try {
-        await rememberDeviceId(deviceId);
-      } catch {
-        // Ignored on purpose.
+    if (pendingDeviceId) return pendingDeviceId;
+    pendingDeviceId = (async () => {
+      // A read failure is NOT a missing identity. Never create a replacement then.
+      const stored = await loadCredential();
+      const fromCredential = typeof stored?.deviceId === 'string' ? stored.deviceId.trim() : '';
+      const remembered = typeof getSettings === 'function' ? rememberedDeviceId(getSettings()) : '';
+      const existing = fromCredential || remembered || fallbackDeviceId;
+      const deviceId = existing || randomUUID();
+      if (deviceId !== remembered && typeof rememberDeviceId === 'function') {
+        try { await rememberDeviceId(deviceId); }
+        catch (error) {
+          // A new ID must be durable before it is registered remotely.
+          if (!existing) throw error;
+        }
       }
-    }
-    return deviceId;
+      fallbackDeviceId = deviceId;
+      return deviceId;
+    })();
+    try { return await pendingDeviceId; }
+    finally { pendingDeviceId = null; }
   }
 
   /** Why the Host has (or has not) any data to serve — cheap, and only for diagnosis. */
@@ -212,7 +218,23 @@ export function createHostRoutes({ getRuntime, getDiagnostics, getSettings, reme
    * The route table: one entry per accepted method+path.
    * @returns handlers keyed by method and pathname.
    */
+  async function handleDeleteDevice(req, res, body) {
+    // A cross-origin HTML form cannot issue this JSON-only destructive request.
+    if (!(req.headers?.['content-type'] ?? '').toLowerCase().startsWith('application/json') || req.headers?.['sec-fetch-site'] === 'cross-site') {
+      sendJson(res, 403, { ok: false, message: '删除设备需要同源 JSON 请求' });
+      return;
+    }
+    const runtime = getRuntime();
+    if (typeof runtime?.deleteDevice !== 'function') {
+      sendJson(res, 503, { ok: false, message: 'Cindy Host 运行时尚未就绪' });
+      return;
+    }
+    const result = await runtime.deleteDevice(body.deviceId);
+    sendJson(res, result.ok ? 200 : (result.statusCode ?? 502), { ...result, status: runtime.getStatus() });
+  }
+
   const table = new Map([
+    ['POST /devices/delete', handleDeleteDevice],
     ['GET /status', handleStatus],
     ['POST /reconnect', handleReconnect],
     ['POST /login/request-code', handleRequestCode],
@@ -223,7 +245,7 @@ export function createHostRoutes({ getRuntime, getDiagnostics, getSettings, reme
   ]);
 
   /** Paths that take a JSON body. */
-  const BODY_PATHS = new Set(['/reconnect', '/login/request-code', '/login/verify-code', '/login/select-account', '/logout', '/selftest']);
+  const BODY_PATHS = new Set(['/devices/delete', '/reconnect', '/login/request-code', '/login/verify-code', '/login/select-account', '/logout', '/selftest']);
 
   /**
    * The one handler registered on the web server.

package/src/host-status.js

@@ -21,6 +21,8 @@
  * never shows a terminal failure for an ordinary network loss.
  */
 
+import { HOST_APP_VERSION } from './host-version.js';
+
 /** Ordered state vocabulary; also the wire vocabulary of the status route. */
 export const CONNECTION_STATES = Object.freeze(['disconnected', 'authenticating', 'connecting', 'waiting', 'connected', 'failed']);
 
@@ -149,7 +151,7 @@ export class HostStatus {
       return;
     }
     this.#ownDeviceId = typeof host.deviceId === 'string' ? host.deviceId : null;
-    this.#publish({ host: { deviceName: 'DSH Host', platform: 'desktop', appVersion: '0.1.0', online: true, protocolVersion: null, userId: null, ...host } });
+    this.#publish({ host: { deviceName: 'DSH Host', platform: 'desktop', appVersion: HOST_APP_VERSION, online: true, protocolVersion: null, userId: null, ...host } });
   }
 
   /** Insert or merge one device row, preserving fields the patch omits. */

package/src/host-version.js

@@ -0,0 +1,5 @@
+/** Cindy desktop compatibility version, NOT this plugin's package version.
+ * Source: G:/Projects/Cindy tag v0.1.82, latest non-beta September 2026 tag.
+ * Commit 1d7aaa2fb4456c1ba96ab7f2125567d7c19bbf69, 2026-09-14T20:53:42+07:00.
+ */
+export const HOST_APP_VERSION = '0.1.82';

package/src/host.js

@@ -71,7 +71,9 @@ export const HEARTBEAT_MISS_LIMIT = 3;
 
 export const HOST_DEVICE_NAME = 'DSH Host';
 export const HOST_PLATFORM = 'desktop';
-export const HOST_APP_VERSION = '0.1.0';
+import { deleteAccountDevice } from './host-device-delete.js';
+import { HOST_APP_VERSION } from './host-version.js';
+export { HOST_APP_VERSION } from './host-version.js';
 
 /** Default socket factory; tests inject their own. */
 function openRelaySocket(session, url = RELAY_WS_URL) {
@@ -808,16 +810,52 @@ export async function startHost(initialSource, settings = DEFAULT_HOST_SETTINGS,
    * fixes every such row at once; failures are silent because a missing name
    * only costs a nicer label, never a connection.
    */
+  let directoryEpoch = 0;
+  const pendingDeletes = new Set();
+  async function deleteDevice(deviceId) {
+    if (pendingDeletes.has(deviceId)) return { ok: false, statusCode: 409, message: '设备正在删除' };
+    let owner = session;
+    const epoch = generation;
+    if (stopped || !active) return { ok: false, statusCode: 409, message: '请先连接 Cindy Host' };
+    pendingDeletes.add(deviceId);
+    try {
+      const result = await deleteAccountDevice({
+        deviceId, session: owner, snapshot: status.snapshot(),
+        getSnapshot: () => status.snapshot(), url: deviceListUrl(relayUrl), fetchImpl,
+        refreshSession: async captured => {
+          if (stopped || !active || generation !== epoch || session !== captured) return null;
+          const refreshed = await refreshSessionForMedia();
+          if (!refreshed || stopped || !active || generation !== epoch ||
+              !session || session.deviceId !== captured.deviceId || session.authBaseUrl !== captured.authBaseUrl) return null;
+          owner = session;
+          return session;
+        },
+      });
+      if (stopped || generation !== epoch || session !== owner) return { ok: false, statusCode: 409, message: '连接身份已改变，请刷新设备列表' };
+      if (result.ok) {
+        directoryEpoch++;
+        acceptedControllers.delete(deviceId);
+        subscribers.delete(deviceId);
+        status.removeDevice(deviceId);
+        status.refreshConnectionState();
+      }
+      return result;
+    } finally {
+      pendingDeletes.delete(deviceId);
+    }
+  }
+
   async function refreshDeviceDirectory() {
     if (session === null) return;
     const myGeneration = generation;
+    const readEpoch = directoryEpoch;
     let answer;
     try {
       answer = await listDevices(session, relayUrl);
     } catch {
       return;
     }
-    if (stopped || !active || myGeneration !== generation) return;
+    if (stopped || !active || myGeneration !== generation || readEpoch !== directoryEpoch) return;
     const rows = Array.isArray(answer?.devices) ? answer.devices : [];
     for (const row of rows) {
       if (row === null || typeof row !== 'object') continue;
@@ -2255,6 +2293,7 @@ export async function startHost(initialSource, settings = DEFAULT_HOST_SETTINGS,
     policy,
     status,
     getStatus: () => status.snapshot(),
+    deleteDevice,
     subscribeStatus: (listener) => status.subscribe(listener),
     /** The most recent invokes this Host served, for the status route's diagnostics. */
     getInvokeLog: () => invokeLog.slice(),