@mrrisega/dsh-remote 0.6.0-beta.11 → 0.6.0-beta.2

package/packages/dsh-remote-web/lib/index.js

@@ -4,8 +4,7 @@
 //   - 读写配置目录下 .dsh-config.json（0600）
 //   - 查询/启停 bridge（launchctl，plist 缺失时自动生成，逻辑与 dsh-setup.mjs 一致）
 //   - 代理 relay API（captcha / register / login / public-config），直连、不走系统代理；
-//     另代理企业端一次性访问密钥 / 授权设备（/api/auth-key、/api/mobile-sessions、…/revoke、
-//     DELETE …/:id、POST …/purge，Bearer）供面板「📱 远程访问」卡使用
+//     另代理企业端一次性访问密钥 / 授权设备（/api/auth-key、/api/mobile-sessions、…/revoke，Bearer）供面板「📱 远程访问」卡使用
 //   - 自管理 self*（版本可见 / 新版检测 / 一键在线更新 / 彻底卸载）：插件市场没有更新卸载按钮，
 //     面板内即官方管理入口；更新=后台 npx 按 dist-tag(默认 latest,DSH_UPDATE_TAG 可切 beta/alpha)（幂等补齐运行环境并重启 bridge）；
 //     彻底卸载=profile 插件清理（uninstallSelf）+ 运行时清理（uninstallRuntime：停 bridge 自启动 /
@@ -763,13 +762,13 @@ async function proxyCreateAccessKey(relayDir, res) {
 }
 
 /**
- * GET /dsh-remote/mobile-sessions → 已授权设备列表（企业端 GET /api/mobile-sessions，Bearer）。
+ * GET /dsh-remote/mobile-sessions → 已授权设备列表（企业端 POST /api/mobile-sessions，Bearer）。
  */
 async function proxyMobileSessions(relayDir, res) {
   const token = await relayToken(relayDir).catch(() => "");
   if (!token) return sendJson(res, 401, notLoggedInJson());
   const r = await relayFetch(relayDir, "/api/mobile-sessions", {
-    method: "GET",
+    method: "POST",
     headers: { authorization: `Bearer ${token}` },
   });
   const d = flattenRelayBody(r);
@@ -803,78 +802,8 @@ async function proxyRevokeMobileSession(relayDir, req, res) {
   return sendJson(res, 200, { ok: true, relayStatus: (r && r.status) || 200 });
 }
 
-/**
- * DELETE /dsh-remote/mobile-sessions/delete（body {id}）→ 删除本机该设备的授权记录
- * （企业端 DELETE /api/mobile-sessions/:id，Bearer：本人整行删除并拉黑 jti）。
- */
-async function proxyDeleteMobileSession(relayDir, req, res) {
-  const body = await readJsonBody(req);
-  if (body.__parseError) return sendJson(res, 400, { ok: false, error: "JSON 解析失败" });
-  const id = String(body.id ?? "").trim();
-  if (!id) return sendJson(res, 400, { ok: false, error: "缺少参数 id（会话 ID）" });
-  const token = await relayToken(relayDir).catch(() => "");
-  if (!token) return sendJson(res, 401, notLoggedInJson());
-  const r = await relayFetch(relayDir, `/api/mobile-sessions/${encodeURIComponent(id)}`, {
-    method: "DELETE",
-    headers: { authorization: `Bearer ${token}` },
-  });
-  const d = flattenRelayBody(r);
-  const ok = !!(r.ok && d.ok !== false);
-  if (!ok) {
-    return sendJson(res, (r && r.status) || 502, { ok: false, error: relayErrorMessage(r), relayStatus: (r && r.status) || 0 });
-  }
-  return sendJson(res, 200, { ok: true, relayStatus: (r && r.status) || 200 });
-}
-
-/**
- * POST /dsh-remote/mobile-sessions/purge → 清理本人所有已解绑（revoked）记录
- * （企业端 POST /api/mobile-sessions/purge，Bearer）。
- */
-async function proxyPurgeMobileSessions(relayDir, res) {
-  const token = await relayToken(relayDir).catch(() => "");
-  if (!token) return sendJson(res, 401, notLoggedInJson());
-  const r = await relayFetch(relayDir, "/api/mobile-sessions/purge", {
-    method: "POST",
-    headers: { authorization: `Bearer ${token}` },
-  });
-  const d = flattenRelayBody(r);
-  const ok = !!(r.ok && d.ok !== false);
-  if (!ok) {
-    return sendJson(res, (r && r.status) || 502, { ok: false, error: relayErrorMessage(r), relayStatus: (r && r.status) || 0 });
-  }
-  const removed = Number.isInteger(d.removed) ? d.removed : null;
-  const payload = { ok: true, relayStatus: (r && r.status) || 200 };
-  if (removed !== null) payload.removed = removed;
-  return sendJson(res, 200, payload);
-}
-
 // ---------- 综合状态 ----------
 
-/**
- * 读取 bridge 写入的 E2EE 开关状态（<relayDir>/.e2ee-state.json，写入方见
- * clients/dsh-remote/e2ee-client.mjs 的 writeE2eeStateFile：{enabled, reason, profile, epoch, caps, at}）。
- * 归一化后只透出固定展示字段（enabled/reason/profile/epoch/caps），at 等调试字段不外泄；
- * 文件缺失/损坏一律视为「未启用（明文回退）」——面板据此显示普通安全连接。
- */
-export function readE2eeStateFile(relayDir) {
-  const none = () => ({ enabled: false, reason: "no_state_file", profile: "", epoch: 0, caps: [] });
-  try {
-    const f = join(relayDir, ".e2ee-state.json");
-    if (!existsSync(f)) return none();
-    const s = JSON.parse(readFileSync(f, "utf8"));
-    if (!s || typeof s !== "object") return none();
-    return {
-      enabled: s.enabled === true,
-      reason: typeof s.reason === "string" && s.reason ? s.reason : "",
-      profile: typeof s.profile === "string" ? s.profile : "",
-      epoch: Number.isInteger(s.epoch) && s.epoch >= 0 ? s.epoch : 0,
-      caps: Array.isArray(s.caps) ? s.caps.filter((c) => typeof c === "string") : [],
-    };
-  } catch {
-    return none();
-  }
-}
-
 async function composeStatus(relayDir) {
   const cfg = loadConfig(relayDir);
   const launchd = launchdStatus();
@@ -909,9 +838,6 @@ async function composeStatus(relayDir) {
       manual,
       running: launchd.running || manual.bridge.length > 0,
       bindError,
-      // E2EE 开关状态（bridge 写 .e2ee-state.json；文件缺失 = 未启用明文）：
-      // {enabled, reason, profile, epoch, caps}，供面板「📱 远程访问」卡展示加密状态。
-      e2ee: readE2eeStateFile(relayDir),
     },
     host: hostname(),
   };
@@ -1020,7 +946,7 @@ const PLUGIN_ID = "dsh-remote-web";
 const PLUGIN_LEGACY_IDS = ["dsh-remote-ui"];
 const PLUGIN_ALL_IDS = [PLUGIN_ID, ...PLUGIN_LEGACY_IDS];
 /** 插件自身发布版本（与 dsh-remote 根包同步递增）。 */
-const PLUGIN_VERSION = "0.6.0-beta.11";
+const PLUGIN_VERSION = "0.6.0-beta.2";
 const UPDATE_LOG = ".dsh-update.log";
 const UPDATE_MARKER = ".dsh-update-running";
 
@@ -1296,22 +1222,6 @@ function registerRoutes(ctx, relayDir) {
         await proxyRevokeMobileSession(relayDir, req, res);
       },
     },
-    // 删除已授权设备记录（整行删除并拉黑 jti；企业端 DELETE /api/mobile-sessions/:id，Bearer）
-    {
-      method: "DELETE",
-      path: "/dsh-remote/mobile-sessions/delete",
-      handler: async (req, res) => {
-        await proxyDeleteMobileSession(relayDir, req, res);
-      },
-    },
-    // 清理本人全部已解绑（revoked）记录（企业端 POST /api/mobile-sessions/purge，Bearer）
-    {
-      method: "POST",
-      path: "/dsh-remote/mobile-sessions/purge",
-      handler: async (_req, res) => {
-        await proxyPurgeMobileSessions(relayDir, res);
-      },
-    },
     {
       method: "POST",
       path: "/dsh-remote/config",
@@ -1391,27 +1301,6 @@ function registerRoutes(ctx, relayDir) {
         sendJson(res, r.status || 502, { ok: r.ok, status: r.status, body: r.body });
       },
     },
-    {
-      method: "POST",
-      path: "/dsh-remote/password/reset",
-      handler: async (req, res) => {
-        // 公开 POST /api/password/reset（无需 Bearer）：短信验证码重置密码。
-        // 成功 → 企业端使该账号全部授权设备/会话失效（含 E2EE 派生口令）。
-        const body = await readJsonBody(req);
-        if (body.__parseError) return sendJson(res, 400, { ok: false, error: "JSON 解析失败" });
-        const phone = String(body.phone ?? "").trim();
-        const smsCode = String(body.sms_code ?? "").trim();
-        const newPassword = String(body.new_password ?? body.password ?? "");
-        if (!phone || !smsCode || !newPassword) return sendJson(res, 400, { ok: false, error: "手机号、短信验证码与新密码必填" });
-        const r = await relayFetch(relayDir, "/api/password/reset", {
-          method: "POST",
-          headers: { "content-type": "application/json" },
-          body: JSON.stringify({ phone, sms_code: smsCode, new_password: newPassword }),
-        });
-        // 透传企业端 ok/error（成功 200 {ok:true}；失败保留 status 与错误体）
-        sendJson(res, r.status || 502, { ok: r.ok, status: r.status, body: r.body });
-      },
-    },
     {
       method: "GET",
       path: "/dsh-remote/captcha",

package/packages/dsh-remote-web/test/access-key-sessions.test.mjs

@@ -1,7 +1,5 @@
 // 插件 node 半新增代理回归：/dsh-remote/access-key | mobile-sessions | mobile-sessions/revoke
-// | mobile-sessions/delete | mobile-sessions/purge
-// （企业端 E1 契约：POST /api/auth-key、GET /api/mobile-sessions、POST /api/mobile-sessions/:id/revoke、
-//  DELETE /api/mobile-sessions/:id、POST /api/mobile-sessions/purge，Bearer device-login JWT）
+// （企业端 E1 契约：POST /api/auth-key、POST /api/mobile-sessions、POST /api/mobile-sessions/:id/revoke，Bearer device-login JWT）
 // 覆盖：Bearer 透传、字段扁平化、未登录 401、qr 缺失容错、上游错误透传。
 import assert from "node:assert/strict";
 import http from "node:http";
@@ -32,7 +30,7 @@ function startFakeRelay(opts = {}) {
       if (!opts.noQr) body.qr_data_url = QR;
       return send(200, body);
     }
-    if ((req.method === "GET" || req.method === "POST") && url.pathname === "/api/mobile-sessions") {
+    if (req.method === "POST" && url.pathname === "/api/mobile-sessions") {
       return send(200, {
         ok: true,
         sessions: [
@@ -43,9 +41,6 @@ function startFakeRelay(opts = {}) {
     }
     if (req.method === "POST" && url.pathname === "/api/mobile-sessions/ms_1/revoke") return send(200, { ok: true });
     if (req.method === "POST" && url.pathname === "/api/mobile-sessions/ghost/revoke") return send(404, { error: { message: "not_found" } });
-    if (req.method === "DELETE" && url.pathname === "/api/mobile-sessions/ms_1") return send(200, { ok: true });
-    if (req.method === "DELETE" && url.pathname === "/api/mobile-sessions/ghost") return send(404, { error: { message: "not_found" } });
-    if (req.method === "POST" && url.pathname === "/api/mobile-sessions/purge") return send(200, { ok: true, removed: 2 });
     send(404, { error: { code: "not_found" } });
   });
   return new Promise((resolve) => srv.listen(0, "127.0.0.1", () => resolve({ srv, seen, port: srv.address().port })));
@@ -122,7 +117,7 @@ test("mobile-sessions 路由：列表透传，Bearer 已带上", async () => {
     assert.equal(r.sessions[0].label, "iPhone 15");
     assert.equal(r.sessions[0].os, "iOS");
     const up = relay.seen.find((s) => s.path === "/api/mobile-sessions");
-    assert.equal(up.method, "GET"); // 列表为 GET；POST 仅用于 auth-key/revoke
+    assert.equal(up.method, "POST");
     assert.equal(up.authorization, "Bearer jwt-abc");
   } finally {
     host.close();
@@ -160,66 +155,7 @@ test("mobile-sessions/revoke 路由：body {id} 转发到 /api/mobile-sessions/:
   }
 });
 
-test("mobile-sessions/delete 路由：DELETE body {id} 转发到企业端 DELETE /api/mobile-sessions/:id（拉黑 jti）", async () => {
-  const relay = await startFakeRelay();
-  const { host, base, tempDir } = await bootRelay(relay.port);
-  try {
-    const r = await (await fetch(`${base}/dsh-remote/mobile-sessions/delete`, {
-      method: "DELETE",
-      headers: { "content-type": "application/json" },
-      body: JSON.stringify({ id: "ms_1" }),
-    })).json();
-    assert.equal(r.ok, true);
-    const up = relay.seen.find((s) => s.path === "/api/mobile-sessions/ms_1" && s.method === "DELETE");
-    assert.ok(up, "应转发到企业端 DELETE /api/mobile-sessions/ms_1");
-    assert.equal(up.authorization, "Bearer jwt-abc");
-
-    // 缺 id → 400；不存在的会话 → 透传 404 文案
-    const bad = await (await fetch(`${base}/dsh-remote/mobile-sessions/delete`, {
-      method: "DELETE",
-      headers: { "content-type": "application/json" },
-      body: JSON.stringify({}),
-    })).json();
-    assert.equal(bad.ok, false);
-    assert.match(String(bad.error), /id/);
-
-    const ghost = await (await fetch(`${base}/dsh-remote/mobile-sessions/delete`, {
-      method: "DELETE",
-      headers: { "content-type": "application/json" },
-      body: JSON.stringify({ id: "ghost" }),
-    })).json();
-    assert.equal(ghost.ok, false);
-    assert.match(String(ghost.error), /not_found/);
-  } finally {
-    host.close();
-    relay.srv.close();
-    await rm(tempDir, { recursive: true, force: true });
-  }
-});
-
-test("mobile-sessions/purge 路由：POST → 企业端 POST /api/mobile-sessions/purge，removed 透传", async () => {
-  const relay = await startFakeRelay();
-  const { host, base, tempDir } = await bootRelay(relay.port);
-  try {
-    const r = await (await fetch(`${base}/dsh-remote/mobile-sessions/purge`, {
-      method: "POST",
-      headers: { "content-type": "application/json" },
-      body: JSON.stringify({}),
-    })).json();
-    assert.equal(r.ok, true);
-    assert.equal(r.removed, 2, "企业端返回的 removed 清理条数应透传");
-    const up = relay.seen.find((s) => s.path === "/api/mobile-sessions/purge");
-    assert.ok(up, "应转发到 /api/mobile-sessions/purge");
-    assert.equal(up.method, "POST");
-    assert.equal(up.authorization, "Bearer jwt-abc");
-  } finally {
-    host.close();
-    relay.srv.close();
-    await rm(tempDir, { recursive: true, force: true });
-  }
-});
-
-test("未登录（无账号配置）→ 五条路由统一 401 提示登录，不请求企业端", async () => {
+test("未登录（无账号配置）→ 三条路由统一 401 提示登录，不请求企业端", async () => {
   const relay = await startFakeRelay();
   const tempDir = await mkdtemp(path.join(os.tmpdir(), "dsh-aks-401-"));
   await writeFile(path.join(tempDir, ".dsh-config.json"), JSON.stringify({ api_url: `http://127.0.0.1:${relay.port}` }));
@@ -243,19 +179,13 @@ test("未登录（无账号配置）→ 五条路由统一 401 提示登录，
       assert.equal((await (await fetch(`${base}${p}`, { method }))).status, 401, `${p} 应返回 401`);
       assert.match(String(r.error), /尚未登录/);
     }
-    for (const [method, p] of [
-      ["POST", "/dsh-remote/mobile-sessions/revoke"],
-      ["DELETE", "/dsh-remote/mobile-sessions/delete"],
-      ["POST", "/dsh-remote/mobile-sessions/purge"],
-    ]) {
-      const r = await (await fetch(`${base}${p}`, {
-        method,
-        headers: { "content-type": "application/json" },
-        body: JSON.stringify({ id: "ms_1" }),
-      })).json();
-      assert.equal(r.ok, false);
-      assert.match(String(r.error), /尚未登录/);
-    }
+    const rev = await (await fetch(`${base}/dsh-remote/mobile-sessions/revoke`, {
+      method: "POST",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify({ id: "ms_1" }),
+    })).json();
+    assert.equal(rev.ok, false);
+    assert.match(String(rev.error), /尚未登录/);
     assert.ok(!relay.seen.some((s) => s.path.startsWith("/api/auth-key") || s.path.startsWith("/api/mobile-sessions")), "未登录不应请求企业端");
   } finally {
     host.close();

package/packages/dsh-remote-web/test/account-switch.test.mjs

@@ -6,7 +6,7 @@ import path from "node:path";
 import test from "node:test";
 import { apply } from "../lib/index.js";
 
-test("切换账号时轮换设备身份并重启 bridge", { skip: process.platform !== "darwin" }, async () => {
+test("切换账号时轮换设备身份并重启 bridge", async () => {
   const tempDir = await mkdtemp(path.join(os.tmpdir(), "dsh-account-switch-"));
   const fakeHome = path.join(tempDir, "home");
   const fakeBin = path.join(tempDir, "bin");

package/packages/dsh-remote-web/test/remote-access-ui.test.mjs

@@ -22,12 +22,6 @@ function find(tree, predicate) {
   return match;
 }
 
-function findAll(tree, predicate) {
-  const out = [];
-  walk(tree, (node) => { if (predicate(node)) out.push(node); });
-  return out;
-}
-
 /** 文本子节点包含子串（用于动态拼接文案断言）。 */
 function textHas(tree, substr) {
   return !!find(tree, (node) => (node.children || []).some((c) => typeof c === "string" && c.includes(substr)));
@@ -114,19 +108,11 @@ function loadPlugin(opts = {}) {
       }
       if (path === "/dsh-remote/mobile-sessions") {
         sessionsCalls++;
-        // 默认：首次给列表，后续刷新给空（模拟已全部清理）；测试可传 opts.sessions 固定列表
-        const list = opts.sessions !== undefined ? opts.sessions : (sessionsCalls === 1 ? SESSIONS_1 : []);
-        return response(200, { ok: true, sessions: list });
+        return response(200, { ok: true, sessions: sessionsCalls === 1 ? SESSIONS_1 : [] }); // 取消配对后的刷新 → 空列表
       }
       if (path === "/dsh-remote/mobile-sessions/revoke") {
         return response(200, { ok: true });
       }
-      if (path === "/dsh-remote/mobile-sessions/delete") {
-        return response(200, { ok: true });
-      }
-      if (path === "/dsh-remote/mobile-sessions/purge") {
-        return response(200, { ok: true, removed: 1 });
-      }
       if (path === "/dsh-remote/account") return response(200, { ok: true, account: { phone: "13800000000", plan: "free", plan_source: "plan", invite_code: "ABC12345" } });
       return response(200, { ok: true });
     },
@@ -186,7 +172,7 @@ test("📱 远程访问卡：bridge 在线 → 绿点文案；登录态点「生
   assert.ok(qr && qr.props?.alt === "远程访问二维码", "应渲染服务端返回的二维码 <img>");
   // 到期倒计时/有效至文案
   assert.ok(textHas(tree, "有效至") && textHas(tree, "剩余"), "应显示「有效至 HH:MM:SS / 剩余 xx:xx」倒计时");
-  assert.ok(textHas(tree, "用一次即失效"), "应说明一次性/30 分钟语义（精简一句）");
+  assert.ok(textHas(tree, "访问一次后失效"), "应说明一次性/30 分钟语义");
 });
 
 test("已授权设备：展开列表（label/os/browser/时间）→ 取消配对二次确认 → 成功提示并刷新", async () => {
@@ -230,76 +216,6 @@ test("已授权设备：展开列表（label/os/browser/时间）→ 取消配
   assert.ok(textHas(tree, "暂无已授权设备（手机扫码后出现）"), "刷新后空态文案应出现");
 });
 
-test("已授权设备行内操作：活跃行有 取消配对+删除记录，已取消行有 删除记录；删除记录二次确认 → DELETE delete {id}", async () => {
-  const plugin = loadPlugin({ sessions: SESSIONS_1 }); // 固定列表：操作后重拉仍保留，便于断言行内按钮
-  plugin.states[0] = { config: { phone: "13800000000", deviceId: "dev-x" }, service: { running: true } };
-  let tree = plugin.render();
-  const openBtn = find(tree, (n) => typeof n.props?.onClick === "function" && (n.children || []).some((c) => typeof c === "string" && c.includes("已授权设备")));
-  openBtn.props.onClick();
-  await flush();
-  await flush();
-  tree = plugin.render();
-
-  // 行内按钮：活跃行（ms_1）应有「取消配对」+「删除记录」；已取消行（ms_2）只应有「删除记录」
-  const delBtns = findAll(tree, (n) => typeof n.props?.onClick === "function" && (n.children || []).some((c) => typeof c === "string" && c.includes("删除记录")));
-  assert.ok(delBtns.length >= 2, "每行（含已取消/历史）都应有「删除记录」按钮");
-  assert.ok(find(tree, (n) => typeof n.props?.onClick === "function" && (n.children || []).some((c) => typeof c === "string" && c.includes("取消配对"))),
-    "活跃行应有「取消配对」按钮");
-  // 底部有「清理已解绑」入口（卡片底部）
-  assert.ok(textHas(tree, "清理已解绑"), "卡片底部应提供「清理已解绑」");
-
-  // 删除 ms_1：第一次点击进入确认态（不请求）
-  delBtns[0].props.onClick();
-  tree = plugin.render();
-  assert.ok(textHas(tree, "再点一次确认删除记录"), "删除记录需二次确认");
-  assert.ok(!plugin.requests.some((r) => r.path === "/dsh-remote/mobile-sessions/delete"), "首次点击不应发 DELETE");
-
-  // 第二次点击 → DELETE /dsh-remote/mobile-sessions/delete {id} → 提示 + 刷新列表
-  const listBefore = plugin.requests.filter((r) => r.path === "/dsh-remote/mobile-sessions").length;
-  find(tree, (n) => typeof n.props?.onClick === "function" && (n.children || []).some((c) => typeof c === "string" && c.includes("再点一次确认删除记录"))).props.onClick();
-  await flush();
-  await flush();
-  await flush();
-  const del = plugin.requests.find((r) => r.path === "/dsh-remote/mobile-sessions/delete");
-  assert.ok(del, "确认后应 DELETE /dsh-remote/mobile-sessions/delete");
-  assert.equal(del.method, "DELETE");
-  assert.deepEqual(del.body, { id: "ms_1" }, "行内删除应带上该行 session id");
-  assert.ok(plugin.requests.filter((r) => r.path === "/dsh-remote/mobile-sessions").length > listBefore, "删除后应重拉设备列表");
-  tree = plugin.render();
-  assert.ok(textHas(tree, "已删除该设备的记录"), "删除成功应有可读提示");
-});
-
-test("已授权设备：卡片底部「清理已解绑」→ 二次确认 → POST purge → 提示条数 + 刷新列表", async () => {
-  const plugin = loadPlugin({ sessions: SESSIONS_1 });
-  plugin.states[0] = { config: { phone: "13800000000", deviceId: "dev-x" }, service: { running: true } };
-  let tree = plugin.render();
-  const openBtn = find(tree, (n) => typeof n.props?.onClick === "function" && (n.children || []).some((c) => typeof c === "string" && c.includes("已授权设备")));
-  openBtn.props.onClick();
-  await flush();
-  await flush();
-  tree = plugin.render();
-
-  // 底部 purge 按钮：带 1 条已解绑计数
-  const purgeBtn = find(tree, (n) => typeof n.props?.onClick === "function" && (n.children || []).some((c) => typeof c === "string" && c.includes("清理已解绑")));
-  assert.ok(purgeBtn, "卡片底部应有「清理已解绑」按钮");
-  purgeBtn.props.onClick();
-  tree = plugin.render();
-  assert.ok(textHas(tree, "再点一次确认清理已解绑"), "清理已解绑需二次确认");
-  assert.ok(!plugin.requests.some((r) => r.path === "/dsh-remote/mobile-sessions/purge"), "首次点击不应发请求");
-
-  const listBefore = plugin.requests.filter((r) => r.path === "/dsh-remote/mobile-sessions").length;
-  find(tree, (n) => typeof n.props?.onClick === "function" && (n.children || []).some((c) => typeof c === "string" && c.includes("再点一次确认清理已解绑"))).props.onClick();
-  await flush();
-  await flush();
-  await flush();
-  const purge = plugin.requests.find((r) => r.path === "/dsh-remote/mobile-sessions/purge");
-  assert.ok(purge, "确认后应 POST /dsh-remote/mobile-sessions/purge");
-  assert.equal(purge.method, "POST");
-  assert.ok(plugin.requests.filter((r) => r.path === "/dsh-remote/mobile-sessions").length > listBefore, "清理后应重拉设备列表");
-  tree = plugin.render();
-  assert.ok(textHas(tree, "已清理 1 条已解绑记录"), "应提示清理条数（可读）");
-});
-
 test("升级/续费按钮：点击 → GET /dsh-remote/access-key → window.open(url)（带登录态打开）", async () => {
   const plugin = loadPlugin();
   plugin.states[0] = { config: { phone: "13800000000", deviceId: "dev-x" }, service: { running: true } };
@@ -334,92 +250,4 @@ test("二维码缺失容错 + 未登录引导文案（源码级约束）", () =>
   assert.match(SOURCE, /已连接（可远程访问）/);
   assert.match(SOURCE, /带登录态/);
   assert.match(SOURCE, /通过手机或另一台电脑远程使用同一份 dsh web/);
-  // 已授权设备管理（delete/purge 代理路由与按钮）
-  assert.match(SOURCE, /dsh-remote\/mobile-sessions\/delete/);
-  assert.match(SOURCE, /dsh-remote\/mobile-sessions\/purge/);
-  assert.match(SOURCE, /删除记录/);
-  assert.match(SOURCE, /清理已解绑/);
-  assert.match(SOURCE, /再点一次确认删除记录/);
-  assert.match(SOURCE, /再点一次确认清理已解绑/);
-  // 文案精简：二维码说明压成一句、右侧长段压成一句
-  assert.match(SOURCE, /扫码即进入，30 分钟有效、用一次即失效。/);
-  assert.match(SOURCE, /打开链接\/扫码进入即登录态；同设备重复扫码只更新授权，不新增设备。/);
-  assert.doesNotMatch(SOURCE, /每次生成的链接 30 分钟有效、访问一次后失效/);
-  assert.doesNotMatch(SOURCE, /手机上打开链接点「进入」即可像在本机一样使用 dsh web/);
-});
-
-// ---------- 端到端加密（E2EE，Phase-5）状态徽标 ----------
-
-const E2EE_STATE = {
-  enabled: { enabled: true, reason: "ok", profile: "pbkdf2-sha256-600k", epoch: 1, caps: ["e2ee-v2"] },
-  serverDisabled: { enabled: false, reason: "server_disabled", profile: "", epoch: 0, caps: [] },
-  paramsUnreachable: { enabled: false, reason: "params_unreachable", profile: "", epoch: 0, caps: [] },
-  localDisabled: { enabled: false, reason: "disabled_by_config", profile: "", epoch: 0, caps: [] },
-  deriveFailed: { enabled: false, reason: "derive_failed", profile: "", epoch: 0, caps: [] },
-  unknownReason: { enabled: false, reason: "brand_new_reason_x", profile: "", epoch: 0, caps: [] },
-};
-
-function stateWith(service) {
-  return { config: { phone: "13800000000", deviceId: "dev-x", mode: "saas" }, service, remoteUrl: "https://app.test/" };
-}
-
-function e2eeLine(tree) {
-  return find(tree, (n) => n.props && typeof n.props.className === "string" && n.props.className.indexOf("dru-e2ee-line") === 0);
-}
-
-test("E2EE 徽标：已启用 → “🔒 端到端加密已启用（手机解锁后生效）”（service.e2ee 字段驱动）", () => {
-  const plugin = loadPlugin();
-  plugin.states[0] = stateWith({ running: true, e2ee: E2EE_STATE.enabled });
-  const tree = plugin.render();
-  const line = e2eeLine(tree);
-  assert.ok(line, "启用态应在「📱 远程访问」卡渲染加密状态行");
-  assert.match(String(line.props.className), /ok/, "启用态状态行应为绿色（ok）标记");
-  assert.ok(textHas(tree, "🔒 端到端加密已启用"), "应显示“端到端加密已启用”徽标文案");
-  assert.ok(textHas(tree, "手机解锁后生效"), "应提示“手机解锁后生效”（bridge 就绪、手机解锁后方生效）");
-});
-
-test("E2EE 徽标：未启用原因映射可读文案（服务端关闭 / 参数不可达 / 本地关闭 / 改密 / 未知兜底）", () => {
-  const cases = [
-    [E2EE_STATE.serverDisabled, "端到端加密暂不可用（当前为普通安全连接 HTTPS）"],
-    [E2EE_STATE.paramsUnreachable, "当前为普通安全连接（HTTPS）"],
-    [E2EE_STATE.localDisabled, "当前为普通安全连接（HTTPS）"],
-    [E2EE_STATE.deriveFailed, "账号密码已变更"],
-    [E2EE_STATE.unknownReason, "当前为普通安全连接（HTTPS）"], // 未知 reason → 兜底
-  ];
-  for (const [e2ee, text] of cases) {
-    const plugin = loadPlugin();
-    plugin.states[0] = stateWith({ running: true, e2ee });
-    const tree = plugin.render();
-    assert.ok(textHas(tree, text), `reason=${e2ee.reason} 应映射为可读文案: ${text}`);
-    const line = e2eeLine(tree);
-    assert.ok(line && !/ ok/.test(String(line.props.className)), `reason=${e2ee.reason} 非启用态不应带 ok 标记`);
-  }
-});
-
-test("E2EE 徽标：未登录 / host 未下发 e2ee → 不打扰（不渲染状态行）", () => {
-  // 未登录（config 无 phone）即便 bridge 上报 enabled 也不打扰
-  const anon = loadPlugin();
-  anon.states[0] = { config: { deviceId: "dev-x", mode: "saas" }, service: { running: true, e2ee: E2EE_STATE.enabled } };
-  assert.equal(e2eeLine(anon.render()), undefined, "未登录不应渲染 E2EE 状态行");
-  assert.ok(!textHas(anon.render(), "手机解锁后生效"), "未登录不应出现加密徽标文案");
-
-  // 已登录但 service 无 e2ee（旧 host / 未下发）→ 不渲染
-  const oldHost = loadPlugin();
-  oldHost.states[0] = stateWith({ running: true });
-  assert.equal(e2eeLine(oldHost.render()), undefined, "未下发 service.e2ee 时不应渲染状态行");
-});
-
-test("E2EE 徽标（源码级约束）：client 含徽标字段/文案与 reason 映射表", () => {
-  assert.match(SOURCE, /service\.e2ee/);
-  assert.match(SOURCE, /\.e2ee-state\.json/);
-  assert.match(SOURCE, /🔒 端到端加密已启用（手机解锁后生效）/);
-  assert.match(SOURCE, /端到端加密暂不可用（当前为普通安全连接 HTTPS）/);
-  assert.doesNotMatch(SOURCE, /等待服务端开启 E2EE/);   // 已正式开启，不再出现“灰度等待”措辞
-  assert.match(SOURCE, /当前为普通安全连接（HTTPS）/);
-  assert.match(SOURCE, /server_disabled/);
-  assert.match(SOURCE, /params_unreachable/);
-  assert.match(SOURCE, /disabled_by_config/);
-  assert.match(SOURCE, /derive_failed/);
-  assert.match(SOURCE, /describeE2ee/);
-  assert.match(SOURCE, /dru-e2ee-line/);
 });

package/packages/dsh-remote-web/test/settings-entry.test.mjs

@@ -1,6 +1,6 @@
 // dsh-remote-web 浏览器半回归（2026-09 前名 dsh-remote-ui）：面板入口迁移进「设置」页 settings.section 官方扩展点。
-// 覆盖：栏目注册（id/order/label）、侧边栏入口与浮动面板移除（不再向官方侧栏注入任何按钮/点击机器）、
-// 账号区无「切换账号」、「关于 dsh-remote」说明卡片、退出登录/切换连接账号清理反馈线程凭据、首次安装红点引导。
+// 覆盖：栏目注册（id/order/label）、侧边栏入口与浮动面板移除、账号区无「切换账号」、
+// 「关于 dsh-remote」说明卡片、退出登录/切换连接账号清理反馈线程凭据、首次安装红点引导。
 import assert from "node:assert/strict";
 import { readFileSync } from "node:fs";
 import test from "node:test";
@@ -87,7 +87,6 @@ function loadPlugin(opts = {}) {
   });
 
   const allCreated = [];
-  const intervals = [];
   const doc = {
     createElement(tag) { const el = makeEl(tag); allCreated.push(el); return el; },
     head: makeEl("head"),
@@ -96,10 +95,7 @@ function loadPlugin(opts = {}) {
       const cls = sel.charAt(0) === "." ? sel.slice(1) : "";
       return allCreated.find((el) => el.className === cls) || null;
     },
-    querySelectorAll(sel) {
-      if (sel === "button") return opts.navCells || [];
-      return [];
-    },
+    querySelectorAll(sel) { return sel === "button" ? (opts.navCells || []) : []; },
   };
 
   let lastObserver = null;
@@ -133,7 +129,7 @@ function loadPlugin(opts = {}) {
       return response(200, { body: { ok: true } });
     },
     navigator: { clipboard: { writeText: async () => {} } },
-    setInterval(cb, ms) { intervals.push({ cb, ms }); return intervals.length; },
+    setInterval() { return 1; },
     clearInterval() {},
     setTimeout() { return 1; },
     Set,
@@ -156,7 +152,6 @@ function loadPlugin(opts = {}) {
 
   return {
     registered, metas, injects, requests, removed, states, localStorage,
-    intervals,
     lastObserver: () => lastObserver,
     renderSection() { hook = 0; return registered.get("dsh-remote")({ close() {} }); },
   };
@@ -208,7 +203,7 @@ test("登录态账号区：无「切换账号」，有「退出登录」，头
     "📱 远程访问：用手机或另一台电脑的浏览器，随时随地使用同一份 dsh web——人在哪都能用（免公网 IP、免内网穿透）；官方托管中继，4G/5G 即用，也可自建服务。",
     "🛠 电脑端一键安装：bridge 与「远程访问」面板一次到位——云端/自建切换、账号登录、bridge 启停、一次性扫码访问、已授权设备管理、意见反馈都在这里。",
     "🔒 安全与通道：HTTP / WebSocket 全量透传，一次性访问密钥认证，面板实时显示设备与已授权设备列表；服务端可配置流量配额。",
-    "🛡 端到端加密：手机↔电脑之间的消息内容用「你的账号密码派生密钥」端到端加密——密钥与密码不落服务端（仅存校验值），中继只可见路径/大小/时间（详见 README「安全与隐私」）。",
+    "🛡 端到端流量保护：可选对通道做端到端加密保护，传输全程不暴露本机公网 IP（详见项目 README「安全」说明）。",
   ];
   for (const p of points) {
     assert.ok(find(tree, (n) => n.children?.includes(p)), `说明卡片应含要点: ${p.slice(0, 12)}…`);
@@ -282,51 +277,6 @@ test("红点已看过（localStorage 有 key）时不注入，重启 DSH Web 不
   assert.equal(navCell.children.length, 0, "已看过时不应再注入红点");
 });
 
-test("红点只挂在设置页「远程访问」栏目导航（navCell）：普通按钮即使文本含「远程访问」也不注入，不遮挡官方入口", () => {
-  const navCells = [];
-  const officialCell = makeEl("button");
-  officialCell.className = "VOzbGW_navCell"; // shell hashed 类名（含 navCell 子串）＝设置页栏目导航
-  officialCell.textContent = "📱 远程访问";
-  const plainBtn = makeEl("button");
-  plainBtn.className = "some-other-btn"; // 非 navCell（官方侧栏/内容区按钮）：即使含「远程访问」也不得注入
-  plainBtn.textContent = "远程访问";
-  const plugin = loadPlugin({ navCells });
-
-  navCells.push(officialCell, plainBtn);
-  plugin.lastObserver().cb([]);
-
-  assert.equal(officialCell.children.length, 1, "官方设置页「远程访问」栏目按钮应注入红点");
-  assert.equal(officialCell.children[0].className, "dru-reddot");
-  assert.equal(plainBtn.children.length, 0, "非栏目导航按钮不得注入红点（不遮挡官方按钮）");
-});
-
-// ---------- 入口收敛：不再向官方侧栏注入任何按钮 / 导航点击机器 ----------
-// 用户从官方「设置」进入 → 点 settings.section「远程访问」栏目（官方扩展点，天然不冲突），
-// 官方「设置」按钮保持原样、不被遮挡。旧 Bug A 侧栏注入实现（容器限定点击流 + 独立按钮 +
-// 红点 + openRemoteSettings/__dshRemoteNav）已整段移除，红点只保留在设置页栏目导航 navCell 上。
-
-test("源码约束：侧栏注入按钮/导航点击机器已移除，官方「设置」不被抢、红点仅保留在设置页栏目导航", () => {
-  // 不再存在：侧栏 DOM 注入 / 导航容器点击 / 暴露给宿主与自动化的 open 入口
-  assert.doesNotMatch(SOURCE, /injectSidebarRemoteEntry/);
-  assert.doesNotMatch(SOURCE, /dru-nav-remote/);
-  assert.doesNotMatch(SOURCE, /dsh-remote-nav-seen/);
-  assert.doesNotMatch(SOURCE, /openRemoteSettings/);
-  assert.doesNotMatch(SOURCE, /clickNavToken/);
-  assert.doesNotMatch(SOURCE, /remoteSectionVisible/);
-  assert.doesNotMatch(SOURCE, /__dshRemoteNav/);
-  assert.doesNotMatch(SOURCE, /data-dru-remote/);
-  assert.doesNotMatch(SOURCE, /NAV_ENTRY_ID/);
-  assert.doesNotMatch(SOURCE, /NAV_CONTAINER_SEL/);
-  assert.doesNotMatch(SOURCE, /NAV_TEXT_MAX/);
-  assert.doesNotMatch(SOURCE, /dru-fab/);
-  // 官方按钮不被克隆 / 包装 / 挪位（克隆曾继承官方事件委托与热区 → Bug A）
-  assert.doesNotMatch(SOURCE, /cloneNode/);
-  // 唯一保留的 DOM 注入 = 设置页栏目导航红点（.dru-reddot，navCell 右上角，pointer-events:none）
-  assert.match(SOURCE, /dru-reddot/);
-  assert.match(SOURCE, /navCell/);
-  assert.match(SOURCE, /dsh-remote-seen-dot/);
-});
-
 test("源码约束：无侧边栏入口/浮动面板/切换账号；命名统一为「远程访问」；新增访问密钥/设备路由", () => {
   // 只断言“代码形态”不存在（注释里允许出现说明文字）
   assert.doesNotMatch(SOURCE, /slots\.inject\("sidebar\.footer\.action"/);

package/packages/dsh-remote-web/test/uninstall-runtime.test.mjs

@@ -77,7 +77,7 @@ async function plantInstallation(tempHome, opts = {}) {
   return { relayDir, profile };
 }
 
-test("彻底卸载：配置目录整目录清空（含账号/密钥/固化运行时），不误伤 profile 其它条目与家目录其它数据", { skip: process.platform !== "darwin" }, async () => {
+test("彻底卸载：配置目录整目录清空（含账号/密钥/固化运行时），不误伤 profile 其它条目与家目录其它数据", async () => {
   const tempHome = await mkdtemp(path.join(os.tmpdir(), "dsh-ui-rt-"));
   const prevHome = process.env.HOME;
   process.env.HOME = tempHome;
@@ -220,7 +220,7 @@ test("DSH_RELAY_SKIP_SERVICE 开关：置位时即便存在自启动 plist 也
   }
 });
 
-test("自然跳过（无开关）：HOME 有 plist 但服务未运行 → 删除 plist 但不发 launchctl bootout（PATH 假命令接管）", { skip: process.platform !== "darwin" }, async () => {
+test("自然跳过（无开关）：HOME 有 plist 但服务未运行 → 删除 plist 但不发 launchctl bootout（PATH 假命令接管）", async () => {
   const tempHome = await mkdtemp(path.join(os.tmpdir(), "dsh-ui-rt-natural-"));
   const prevHome = process.env.HOME;
   const prevPath = process.env.PATH;