dsh-remote-web 0.5.0 → 0.6.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/client.js +1134 -120
- package/lib/index.js +559 -39
- package/package.json +2 -2
package/lib/client.js
CHANGED
|
@@ -5,12 +5,20 @@
|
|
|
5
5
|
// factory 内只能 require shell 种子模块(react / react/jsx-runtime 等)。
|
|
6
6
|
//
|
|
7
7
|
// 功能:
|
|
8
|
-
// -
|
|
8
|
+
// - 双入口(2026-09 恢复侧栏注入,与官方共存不遮挡):
|
|
9
|
+
// ① 官方「设置」→「远程访问」栏目(settings.section,位于「Agent 预设」下方,官方扩展点);
|
|
10
|
+
// ② 左侧官方「设置」按钮旁注入独立「📱 远程访问」快捷按钮(id=dru-nav-remote,非 clone,
|
|
11
|
+
// 插在其前方、同布局不覆盖官方按钮;点击直达该栏目,首次带引导红点)
|
|
9
12
|
// - 栏目内联渲染配置面板(浅色高对比 UI,遵循主流登录体验)
|
|
10
13
|
// · 登录态:已登录显示账号 + 退出登录;未登录显示 登录/注册 tabs
|
|
14
|
+
// · 🔒 修改密码(账号卡):已登录账号经 图形验证码+短信验证码 重置(/dsh-remote/password/reset 代理);
|
|
15
|
+
// 成功后全部已授权设备/会话失效 → 本地登出并提示用新密码重新登录(覆盖本机 config 密码)
|
|
16
|
+
// · 忘记密码(登录卡):未登录时登录表单内「忘记密码?」→ 同一套
|
|
17
|
+
// 图形验证码+短信验证码 表单(手机号预填当前输入、可改),成功后本地登出并提示「请用新密码登录」
|
|
11
18
|
// · 登录要求图形验证码;注册要求两次密码 + 图形验证码
|
|
12
|
-
// ·
|
|
13
|
-
//
|
|
19
|
+
// · 📱 远程访问卡:一次性访问密钥(扫码/直接打开/复制 + 到期倒计时自动刷新)与已授权设备管理
|
|
20
|
+
// · bridge 状态与启停开关 + 关于 dsh-remote 说明卡片
|
|
21
|
+
// - 首次安装引导:设置页「远程访问」栏目(官方导航 navCell)旁小红点(localStorage dsh-remote-seen-dot 控制)
|
|
14
22
|
// - shell.overlay:满意度弹窗(安装体验至少 1 小时后弹出,只弹一次)
|
|
15
23
|
// 所有数据经同源 /dsh-remote/* 宿主路由读写(node 半提供)。
|
|
16
24
|
window.__ModuleLoader__.load({
|
|
@@ -40,7 +48,7 @@ window.__ModuleLoader__.load({
|
|
|
40
48
|
".dru-settings-title{margin:0;font-size:17px;font-weight:600;color:var(--dsw-alias-label-primary,#e6edf3)}",
|
|
41
49
|
".dru-settings-sub{font-size:12px;color:var(--dsw-alias-label-tertiary,#8c959f);margin-top:2px}",
|
|
42
50
|
".dru-settings-body{display:flex;flex-direction:column;gap:14px}",
|
|
43
|
-
//
|
|
51
|
+
// 首次安装引导小红点(挂在设置页「远程访问」导航栏目右上角)
|
|
44
52
|
".dru-reddot{position:absolute;top:9px;right:12px;width:7px;height:7px;border-radius:50%;background:#e5484d;box-shadow:0 0 0 2px var(--dsw-alias-bg-layer-2,#fff);pointer-events:none;z-index:1}",
|
|
45
53
|
".dru-card{background:#f6f8fa;border:1px solid #eaeef2;border-radius:10px;padding:14px 16px}",
|
|
46
54
|
".dru-card h3{margin:0 0 8px;font-size:13px;font-weight:700;color:#1f2328}",
|
|
@@ -60,6 +68,8 @@ window.__ModuleLoader__.load({
|
|
|
60
68
|
".dru-btn-ghost:hover:not(:disabled){background:#f6f8fa}",
|
|
61
69
|
".dru-btn-danger{background:#ffffff;color:#cf222e;border-color:#cf222e}",
|
|
62
70
|
".dru-btn-danger:hover:not(:disabled){background:#fff0f1}",
|
|
71
|
+
".dru-linkbtn{display:inline-block;padding:0;border:none;background:none;color:#0969da;font-size:12.5px;line-height:1.6;cursor:pointer;font-family:inherit;text-decoration:none}",
|
|
72
|
+
".dru-linkbtn:hover{text-decoration:underline}",
|
|
63
73
|
".dru-tabs{display:flex;gap:8px;margin-bottom:12px}",
|
|
64
74
|
".dru-tab{flex:1;padding:7px 0;text-align:center;border-radius:8px;cursor:pointer;font-size:13px;font-weight:600;color:#57606a;background:#f6f8fa;border:1px solid #d0d7de;user-select:none}",
|
|
65
75
|
".dru-tab.active{color:#0969da;background:#ffffff;border-color:#0969da}",
|
|
@@ -124,15 +134,42 @@ window.__ModuleLoader__.load({
|
|
|
124
134
|
".dru-popup-foot button{border:none;background:none;color:#57606a;cursor:pointer;font-size:12px;font-family:inherit;padding:4px 6px}",
|
|
125
135
|
".dru-popup-foot button:hover{color:#0969da}",
|
|
126
136
|
".dru-popup .dru-msg{text-align:left}",
|
|
137
|
+
".dru-community-qr{display:block;width:220px;max-width:62vw;margin:0 auto;background:#ffffff;padding:10px;border-radius:10px;border:1px solid #d0d7de;box-sizing:content-box}",
|
|
138
|
+
".dru-fb-community{margin-top:16px;padding-top:14px;border-top:1px dashed #d0d7de;text-align:center}",
|
|
139
|
+
".dru-fb-community .dru-community-qr{width:180px;max-width:56vw}",
|
|
127
140
|
// ── 自管理:版本与更新(插件面板内提供在线更新/彻底卸载,市场无更新按钮) ──
|
|
128
141
|
".dru-ver-badge{display:inline-block;font-size:11px;border-radius:999px;padding:1px 8px;margin-left:6px;vertical-align:1px}",
|
|
129
142
|
".dru-ver-badge-new{color:#9a6700;background:#fff8c5;border:1px solid #eed888}",
|
|
130
143
|
".dru-ver-badge-ok{color:#1a7f37;background:#dafbe1;border:1px solid #aceebb}",
|
|
131
144
|
".dru-up-log{margin-top:8px;background:#0d1117;color:#e6edf3;border-radius:8px;padding:8px 10px;font-family:ui-monospace,SFMono-Regular,Menlo,monospace;font-size:11.5px;line-height:1.5;white-space:pre-wrap;word-break:break-word;max-height:150px;overflow:auto}",
|
|
145
|
+
// ── 📱 远程访问(一次性访问密钥 + 已授权设备管理) ──
|
|
146
|
+
".dru-access-flex{display:flex;gap:14px;flex-wrap:wrap;align-items:flex-start;margin-top:10px}",
|
|
147
|
+
".dru-access-col{flex:1;min-width:230px;display:flex;flex-direction:column;gap:8px}",
|
|
148
|
+
".dru-qr-img{width:180px;height:180px;flex:none;border-radius:8px;border:1px solid #d0d7de;background:#ffffff;object-fit:contain}",
|
|
149
|
+
".dru-qr-ph{width:180px;height:180px;flex:none;border-radius:8px;border:1px dashed #d0d7de;background:#f6f8fa;color:#8c959f;font-size:12px;display:flex;align-items:center;justify-content:center;text-align:center;padding:10px;box-sizing:border-box}",
|
|
150
|
+
".dru-url.big{font-size:13.5px;font-weight:600}",
|
|
151
|
+
".dru-cd{font-size:12px;color:#9a6700;margin-top:2px}",
|
|
152
|
+
".dru-cd-ok{color:#1a7f37}",
|
|
153
|
+
".dru-key-note{font-size:12px;color:#57606a;line-height:1.6}",
|
|
154
|
+
".dru-dev{border:1px solid #eaeef2;border-radius:8px;background:#ffffff;padding:9px 11px;margin-bottom:8px}",
|
|
155
|
+
".dru-dev-top{display:flex;align-items:center;gap:8px;flex-wrap:wrap}",
|
|
156
|
+
".dru-dev-name{font-size:13px;font-weight:600;color:#1f2328;flex:1;min-width:130px}",
|
|
157
|
+
".dru-dev-meta{font-size:11.5px;color:#57606a}",
|
|
158
|
+
".dru-dev-sub{font-size:11px;color:#8c959f;margin-top:3px}",
|
|
159
|
+
".dru-dev-tag{font-size:10.5px;color:#8c959f;border:1px solid #d0d7de;border-radius:999px;padding:0 7px;flex:none;white-space:nowrap}",
|
|
160
|
+
".dru-dev-tag-off{color:#cf222e;border-color:#ffb3b6;background:#fff0f1}",
|
|
161
|
+
// Phase-5:端到端加密(E2EE)状态行 —— 启用=绿字绿点,未启用=灰字(纯文字状态行,不打扰)
|
|
162
|
+
".dru-e2ee-line{display:flex;align-items:center;gap:7px;margin-top:6px;font-size:12px;line-height:1.5;color:#57606a}",
|
|
163
|
+
".dru-e2ee-line.ok{color:#1a7f37}",
|
|
164
|
+
// 侧栏「远程访问」快捷按钮(2026-09 恢复注入,与官方「设置」按钮共存不遮挡):
|
|
165
|
+
// 独立 button(非 clone),插在官方「设置」按钮之前,同源同布局不覆盖官方热区。
|
|
166
|
+
".dru-nav-remote{display:inline-flex;align-items:center;gap:6px;height:30px;margin:0 0 2px;padding:0 10px;border:1px solid #d0d7de;border-radius:8px;background:#ffffff;color:#0969da;font:500 12.5px/1 inherit;cursor:pointer;white-space:nowrap;user-select:none}",
|
|
167
|
+
".dru-nav-remote:hover:not(:disabled){background:#f0f6ff;border-color:#0969da}",
|
|
168
|
+
".dru-nav-remote-dot{position:absolute;top:-2px;right:-2px;width:8px;height:8px;border-radius:50%;background:#e5484d;box-shadow:0 0 0 2px #fff;pointer-events:none}",
|
|
132
169
|
].join("\n");
|
|
133
170
|
document.head.appendChild(styleEl);
|
|
134
171
|
|
|
135
|
-
// ──
|
|
172
|
+
// ── 首次安装引导小红点(设置页「远程访问」栏目,localStorage 控制) ────
|
|
136
173
|
// 无 dsh-remote-seen-dot key 视为首次:在设置页导航栏目右上角显示 CSS 圆点;
|
|
137
174
|
// 点击栏目/红点后写入 key(之后不再显示),重启 DSH Web 不复发。
|
|
138
175
|
// 设置页由官方 shell 渲染(class 含 navCell 的导航按钮 + 栏目 label),
|
|
@@ -168,17 +205,17 @@ window.__ModuleLoader__.load({
|
|
|
168
205
|
});
|
|
169
206
|
} catch (e) {}
|
|
170
207
|
}
|
|
171
|
-
/**
|
|
208
|
+
/** 扫描设置页导航,找到「远程访问」栏目按钮后注入红点。 */
|
|
172
209
|
function dotScan() {
|
|
173
210
|
if (dotSeen()) return;
|
|
174
211
|
var cells = document.querySelectorAll("button");
|
|
175
212
|
for (var i = 0; i < cells.length; i++) {
|
|
176
213
|
var c = cells[i];
|
|
177
|
-
// 语义化匹配:设置页导航按钮(navCell)+
|
|
214
|
+
// 语义化匹配:设置页导航按钮(navCell)+ 栏目名「远程访问」。
|
|
178
215
|
// class 为 shell 的 hashed 类名,取子串匹配避免依赖具体 hash;
|
|
179
216
|
// 若未来 hash 变化导致匹配失败,仅红点不显示,栏目本身不受影响。
|
|
180
217
|
if (String(c.className || "").indexOf("navCell") === -1) continue;
|
|
181
|
-
if ((c.textContent || "").indexOf("
|
|
218
|
+
if ((c.textContent || "").indexOf("远程访问") === -1) continue;
|
|
182
219
|
dotInject(c);
|
|
183
220
|
}
|
|
184
221
|
}
|
|
@@ -195,6 +232,104 @@ window.__ModuleLoader__.load({
|
|
|
195
232
|
dotScan();
|
|
196
233
|
}
|
|
197
234
|
|
|
235
|
+
// ── 侧栏「远程访问」快捷按钮(2026-09 恢复注入:与官方「设置」按钮共存、不遮挡) ──
|
|
236
|
+
// 用户要求:左侧官方「设置」按钮旁保留「远程访问」入口。实现为独立 <button id=dru-nav-remote>
|
|
237
|
+
// (绝不 clone 官方按钮 → 不继承官方事件委托/点击热区),插在官方「设置」按钮之前;
|
|
238
|
+
// 点击 → 打开官方设置页「远程访问」栏目。全程不点工作区会话内容:
|
|
239
|
+
// - 候选一律限定为官方导航(class 含 navCell / 位于导航容器内)+ 短文本/aria 精确匹配;
|
|
240
|
+
// - 命中排除自身与“菜单/更多”语义节点;
|
|
241
|
+
// - 栏目未开时先点官方「设置」,再轮询(≤3s)补点「远程访问」栏目项。
|
|
242
|
+
var NAV_ENTRY_ID = "dru-nav-remote";
|
|
243
|
+
var NAV_TEXT_MAX = 10;
|
|
244
|
+
var NAV_POLL_MAX = 20;
|
|
245
|
+
var NAV_BAD_RE = /(^|[^a-z0-9])(menu|context|more|kebab|dropdown|popover|toolbar)($|[^a-z0-9])/i;
|
|
246
|
+
function navCleanText(el) { try { return (el.textContent || "").replace(/\s+/g, " ").trim(); } catch (e) { return ""; } }
|
|
247
|
+
function navAttrOf(el) {
|
|
248
|
+
try { return String(el.getAttribute("aria-label") || el.getAttribute("title") || "").trim(); } catch (e) { return ""; }
|
|
249
|
+
}
|
|
250
|
+
function navCellLike(el) {
|
|
251
|
+
try {
|
|
252
|
+
var cls = String(el.className || "");
|
|
253
|
+
if (cls.indexOf("navCell") !== -1) return true;
|
|
254
|
+
return !!el.closest('[role="navigation"], nav, [class*="sidebar" i], [class*="sidenav" i], [class*="appnav" i], [class*="navRail" i]');
|
|
255
|
+
} catch (e) { return false; }
|
|
256
|
+
}
|
|
257
|
+
function pickNavByToken(token) {
|
|
258
|
+
try {
|
|
259
|
+
var els = document.querySelectorAll("button, [role='tab'], [role='menuitem'], [role='button'], a, [aria-label]");
|
|
260
|
+
for (var i = 0; i < els.length; i++) {
|
|
261
|
+
var el = els[i];
|
|
262
|
+
if (!el || el.id === NAV_ENTRY_ID) continue; // 排除注入按钮自身(防递归)
|
|
263
|
+
if (!navCellLike(el)) continue;
|
|
264
|
+
if (NAV_BAD_RE.test(String(el.className || ""))) continue;
|
|
265
|
+
var t = navCleanText(el);
|
|
266
|
+
if (t && !/\r|\n/.test(t) && t.length <= NAV_TEXT_MAX &&
|
|
267
|
+
(t === token || t.indexOf(token) === 0 || t.indexOf(token) !== -1)) return el;
|
|
268
|
+
var at = navAttrOf(el);
|
|
269
|
+
if (at && (at === token || at.indexOf(token) === 0)) return el;
|
|
270
|
+
}
|
|
271
|
+
} catch (e) { /* 忽略 */ }
|
|
272
|
+
return null;
|
|
273
|
+
}
|
|
274
|
+
/** 打开「远程访问」设置栏目:栏目已渲染直接点;否则先点官方「设置」再 ≤3s 轮询补点。 */
|
|
275
|
+
function openRemoteSettings() {
|
|
276
|
+
try {
|
|
277
|
+
var cell = pickNavByToken("远程访问");
|
|
278
|
+
if (cell) { cell.click(); return; }
|
|
279
|
+
var st = pickNavByToken("设置");
|
|
280
|
+
if (!st) return;
|
|
281
|
+
st.click();
|
|
282
|
+
var tries = 0;
|
|
283
|
+
var iv = setInterval(function () {
|
|
284
|
+
tries++;
|
|
285
|
+
var c2 = pickNavByToken("远程访问");
|
|
286
|
+
if (c2) { clearInterval(iv); c2.click(); }
|
|
287
|
+
else if (tries >= NAV_POLL_MAX) clearInterval(iv);
|
|
288
|
+
}, 150);
|
|
289
|
+
} catch (e) { /* 忽略 */ }
|
|
290
|
+
}
|
|
291
|
+
/** 注入侧栏按钮到官方「设置」按钮之前(独立 button;首次未见过引导红点)。 */
|
|
292
|
+
function mountNavEntry(host) {
|
|
293
|
+
try {
|
|
294
|
+
if (document.getElementById(NAV_ENTRY_ID)) return;
|
|
295
|
+
var wrap = host && host.parentNode;
|
|
296
|
+
if (!wrap || !wrap.insertBefore || !wrap.contains) return;
|
|
297
|
+
var btn = document.createElement("button");
|
|
298
|
+
btn.type = "button";
|
|
299
|
+
btn.id = NAV_ENTRY_ID;
|
|
300
|
+
btn.className = "dru-nav-remote";
|
|
301
|
+
btn.setAttribute("data-dru-remote", "1");
|
|
302
|
+
btn.title = "打开「远程访问」设置(快捷入口)";
|
|
303
|
+
btn.style.position = "relative";
|
|
304
|
+
btn.textContent = "📱 远程访问";
|
|
305
|
+
btn.addEventListener("click", function (e) {
|
|
306
|
+
try { e.stopPropagation(); e.preventDefault(); } catch (err) {}
|
|
307
|
+
dotMarkSeen(); // 用过快捷入口=已了解入口位置 → 关闭首次红点(含官方栏目红点)
|
|
308
|
+
openRemoteSettings();
|
|
309
|
+
});
|
|
310
|
+
wrap.insertBefore(btn, host);
|
|
311
|
+
if (!dotSeen()) {
|
|
312
|
+
var d = document.createElement("span");
|
|
313
|
+
d.className = "dru-nav-remote-dot";
|
|
314
|
+
btn.appendChild(d);
|
|
315
|
+
}
|
|
316
|
+
} catch (e) { /* 忽略 */ }
|
|
317
|
+
}
|
|
318
|
+
/** 常驻确保:官方「设置」按钮出现后在它前面挂一次入口(去重;2s 心跳,成本极低)。 */
|
|
319
|
+
function navEnsureStart() {
|
|
320
|
+
if (window.__dshRemoteNavStarted) return;
|
|
321
|
+
window.__dshRemoteNavStarted = true;
|
|
322
|
+
try { window.__dshRemoteNav = { open: openRemoteSettings }; } catch (e) {}
|
|
323
|
+
var iv = setInterval(function () {
|
|
324
|
+
try {
|
|
325
|
+
if (document.getElementById(NAV_ENTRY_ID)) return; // 已注入
|
|
326
|
+
var host = pickNavByToken("设置");
|
|
327
|
+
if (host) mountNavEntry(host);
|
|
328
|
+
} catch (e) { /* 忽略 */ }
|
|
329
|
+
}, 2000);
|
|
330
|
+
try { if (iv && typeof iv.unref === "function") iv.unref(); } catch (e) {} // node 测试环境不阻塞退出
|
|
331
|
+
}
|
|
332
|
+
|
|
198
333
|
// ── 宿主 API ────────────────────────────────────────────────────────────
|
|
199
334
|
function api(path, options) {
|
|
200
335
|
return fetch(path, options).then(function (res) {
|
|
@@ -215,10 +350,82 @@ window.__ModuleLoader__.load({
|
|
|
215
350
|
return api(path, { method: "POST", headers: { "content-type": "application/json" }, body: JSON.stringify(data || {}) });
|
|
216
351
|
};
|
|
217
352
|
|
|
353
|
+
// ── 交流群(运营二维码;管理后台统一上传,node 半经公开配置下发) ─────────
|
|
354
|
+
// 设置面板「加入交流群」按钮与用户反馈页都展示同一张码;未配置(qrcode 为空)→ 不展示任何入口。
|
|
355
|
+
var COMMUNITY_TTL_MS = 5 * 60 * 1000; // 面板/反馈卡共用缓存:5 分钟内不重复请求
|
|
356
|
+
var communityCache = { at: 0, data: null };
|
|
357
|
+
/** 取交流群信息(模块级缓存;失败视为未配置,不打扰用户)。 */
|
|
358
|
+
function loadCommunity(force) {
|
|
359
|
+
if (!force && communityCache.data && Date.now() - communityCache.at < COMMUNITY_TTL_MS) {
|
|
360
|
+
return Promise.resolve(communityCache.data);
|
|
361
|
+
}
|
|
362
|
+
return api("/dsh-remote/community").then(function (b) {
|
|
363
|
+
communityCache = { at: Date.now(), data: { qrcode: (b && b.qrcode) || "", wechat: (b && b.wechat) || "" } };
|
|
364
|
+
return communityCache.data;
|
|
365
|
+
}).catch(function () {
|
|
366
|
+
communityCache = { at: Date.now(), data: { qrcode: "", wechat: "" } };
|
|
367
|
+
return communityCache.data;
|
|
368
|
+
});
|
|
369
|
+
}
|
|
370
|
+
|
|
371
|
+
// ── 登录后首次加载的自愈(0.6.1) ───────────────────────────────
|
|
372
|
+
// 现象(首次安装后立即登录):面板在 loggedIn 翻真的瞬间就请求 /dsh-remote/access-key 与
|
|
373
|
+
// /dsh-remote/mobile-sessions;此时中继握手可能尚未就绪(bridge 刚被重启、device-login 共享密钥
|
|
374
|
+
// 刚补齐或正在轮换、中继冷启动/网络抖动),旧版只报一次红字且不重试——必须手动刷新页面才行。
|
|
375
|
+
// 现在:可重试类失败按退避自动重试(成功即自动清除红字),并给红字配「重试」按钮。
|
|
376
|
+
var LOGIN_LOAD_RETRY_MS = [1200, 3000, 6000];
|
|
377
|
+
|
|
378
|
+
/** node 半标记 retryable(中继未就绪)或网络/5xx → 值得自动重试;未登录/密码失效不重试。 */
|
|
379
|
+
function retryableFail(e) {
|
|
380
|
+
var body = e && e.body;
|
|
381
|
+
if (body && body.retryable === true) return true;
|
|
382
|
+
if (body && typeof body.hint === "string" && /^relay_/.test(body.hint)) return true;
|
|
383
|
+
var st = e && e.status;
|
|
384
|
+
if (typeof st !== "number") return true; // fetch 本身失败(网络中断/被中止)
|
|
385
|
+
return st === 0 || st === 408 || st === 429 || st >= 500;
|
|
386
|
+
}
|
|
387
|
+
|
|
388
|
+
/** 定时器节流:tests/SSR 环境没有 setTimeout 时静默降级(不抛错、不阻塞面板)。 */
|
|
389
|
+
function later(fn, ms) {
|
|
390
|
+
try { return setTimeout(fn, ms); } catch (e) { return null; }
|
|
391
|
+
}
|
|
392
|
+
function clearLater(t) {
|
|
393
|
+
if (t == null) return;
|
|
394
|
+
try { clearTimeout(t); } catch (e) { /* 忽略 */ }
|
|
395
|
+
}
|
|
396
|
+
|
|
397
|
+
/** 一次性访问密钥 / 已授权设备列表的自动重试状态(放在组件外:不随渲染重建)。 */
|
|
398
|
+
var akeyRetry = { timer: null, attempt: 0 };
|
|
399
|
+
var devRetry = { timer: null, attempt: 0 };
|
|
400
|
+
// 请求在途标记同样放组件外:组件内 state 闭包会在定时器/轮询回调里过期,
|
|
401
|
+
// 导致 busy 护栏失效(重复请求)或误拦(该重试却跳过)。
|
|
402
|
+
var akeyInFlight = { v: false };
|
|
403
|
+
var devInFlight = { v: false };
|
|
404
|
+
function cancelAkeyRetry() { clearLater(akeyRetry.timer); akeyRetry.timer = null; }
|
|
405
|
+
function cancelDevRetry() { clearLater(devRetry.timer); devRetry.timer = null; }
|
|
406
|
+
|
|
407
|
+
/** 一次性访问 url → 升级/续费页 url(带同一 auth,进入后即登录态到 /app/promo)。 */
|
|
408
|
+
function promoUrlOf(u) {
|
|
409
|
+
var s = String(u || "");
|
|
410
|
+
if (/\/app\/\?auth=/i.test(s)) return s.replace(/\/app\/\?auth=/i, "/app/promo?auth=");
|
|
411
|
+
try {
|
|
412
|
+
var m = /auth=([^&#]+)/.exec(s);
|
|
413
|
+
var origin = s.split("/app")[0];
|
|
414
|
+
if (m && origin) return origin + "/app/promo?auth=" + m[1];
|
|
415
|
+
} catch (e) { /* fallthrough */ }
|
|
416
|
+
return s;
|
|
417
|
+
}
|
|
418
|
+
|
|
218
419
|
// ── 用户反馈模块:本地状态(thread 令牌 / 弹窗节流) ───────────────────
|
|
420
|
+
// 「我的反馈」双数据源:本地 dsh-feedback-threads(thread_token 凭据,匿名/本机未同步行)
|
|
421
|
+
// + 服务端 /api/feedback/mine(登录态账号历史,见 FeedbackCard loadMine/fbRows,合并去重展示)。
|
|
219
422
|
var FB_THREADS_KEY = "dsh-feedback-threads";
|
|
220
423
|
var FB_POPUP_KEY = "dsh-feedback-popup";
|
|
221
424
|
var FB_POPUP_DELAY_MS = 60 * 60 * 1000; // 安装/体验后至少 1 小时才弹窗(只弹一次)
|
|
425
|
+
// 评价去重(2026-09):弹窗状态按「账号(掩码手机号)或设备」分作用域 —— 换账号/换机不重复打扰;
|
|
426
|
+
// 服务端另有 user_id/device_id 409 already_rated 兜底(同一账号/设备只收集一次 rating)。
|
|
427
|
+
var fbPopScope = "anon";
|
|
428
|
+
function setFbPopScope(scope) { fbPopScope = String(scope || "anon"); }
|
|
222
429
|
var FB_CATEGORIES = [
|
|
223
430
|
{ value: "feature", label: "功能类" },
|
|
224
431
|
{ value: "bug", label: "Bug 类" },
|
|
@@ -245,10 +452,17 @@ window.__ModuleLoader__.load({
|
|
|
245
452
|
try { localStorage.removeItem(FB_THREADS_KEY); } catch (e) {}
|
|
246
453
|
}
|
|
247
454
|
function fbPopState() {
|
|
248
|
-
try { return JSON.parse(localStorage.getItem(FB_POPUP_KEY) || "null"); } catch (e) { return null; }
|
|
455
|
+
try { return JSON.parse(localStorage.getItem(FB_POPUP_KEY + ":" + fbPopScope) || "null"); } catch (e) { return null; }
|
|
249
456
|
}
|
|
250
457
|
function fbSavePopState(s) {
|
|
251
|
-
try { localStorage.setItem(FB_POPUP_KEY, JSON.stringify(s)); } catch (e) {}
|
|
458
|
+
try { localStorage.setItem(FB_POPUP_KEY + ":" + fbPopScope, JSON.stringify(s)); } catch (e) {}
|
|
459
|
+
}
|
|
460
|
+
/** 作用域清理:旧版无作用域键也一并视为已完成,避免老用户再次被打扰。 */
|
|
461
|
+
function fbClearPopScope(scopes) {
|
|
462
|
+
try {
|
|
463
|
+
localStorage.removeItem(FB_POPUP_KEY); // 兼容旧键(无后缀)
|
|
464
|
+
if (Array.isArray(scopes)) scopes.forEach(function (sc) { localStorage.removeItem(FB_POPUP_KEY + ":" + sc); });
|
|
465
|
+
} catch (e) {}
|
|
252
466
|
}
|
|
253
467
|
|
|
254
468
|
/** 同源反馈代理调用(浏览器 → /dsh-remote/feedback/* → 独立反馈服务)。 */
|
|
@@ -281,9 +495,25 @@ window.__ModuleLoader__.load({
|
|
|
281
495
|
var threadDataArr = useState(null); var threadData = threadDataArr[0]; var setThreadData = threadDataArr[1];
|
|
282
496
|
var busyArr = useState(""); var busy = busyArr[0]; var setBusy = busyArr[1];
|
|
283
497
|
var msgArr = useState(null); var fbMsg = msgArr[0]; var setFbMsg = msgArr[1];
|
|
498
|
+
// 账号历史(服务端 /feedback/mine 聚合列表):null=未加载;登录态(SaaS 账号已配)打开「我的反馈」时拉取
|
|
499
|
+
var mineListArr = useState(null); var mineList = mineListArr[0]; var setMineList = mineListArr[1];
|
|
500
|
+
var mineErrArr = useState(false); var mineErr = mineErrArr[0]; var setMineErr = mineErrArr[1];
|
|
501
|
+
var mineBusyArr = useState(false); var mineBusy = mineBusyArr[0]; var setMineBusy = mineBusyArr[1];
|
|
502
|
+
// 💬 交流群:反馈页底部展示「加入交流群」二维码(与设置面板共用同一份缓存)
|
|
503
|
+
var commArr = useState(communityCache.data); var comm = commArr[0]; var setComm = commArr[1];
|
|
284
504
|
|
|
285
505
|
function setMsg(kind, text) { setFbMsg({ kind: kind, text: text }); }
|
|
286
506
|
|
|
507
|
+
// 登录态(SaaS 且账号已配)→ 打开「我的反馈」拉账号历史(/mine 需要 JWT,节点半在登录态自动附加);
|
|
508
|
+
// 自建/未登录(cfg.phone 为空)→ 仍走本地 thread_token,不发 /mine。
|
|
509
|
+
var fbAccount = !!(cfg && cfg.phone && fbAuth === "account");
|
|
510
|
+
|
|
511
|
+
useEffect(function () {
|
|
512
|
+
var alive = true;
|
|
513
|
+
loadCommunity().then(function (d) { if (alive) setComm(d); });
|
|
514
|
+
return function () { alive = false; };
|
|
515
|
+
}, []);
|
|
516
|
+
|
|
287
517
|
var loadCfg = useCallback(function () {
|
|
288
518
|
api("/dsh-remote/feedback-config").then(function (b) {
|
|
289
519
|
setCfg(b);
|
|
@@ -294,18 +524,68 @@ window.__ModuleLoader__.load({
|
|
|
294
524
|
}).catch(function (e) { setCfg({ reachable: false }); setMsg("warn", "反馈服务未连接:" + e.message); });
|
|
295
525
|
}, []);
|
|
296
526
|
|
|
527
|
+
/** 服务端账号历史行(mine 列表含该 id)→ 单条打开/回复走服务端(节点半自动附 JWT),无需本地 thread_token。 */
|
|
528
|
+
function fbRowIsAccount(id) {
|
|
529
|
+
return !!(mineList && mineList.some(function (x) { return x.id === id; }));
|
|
530
|
+
}
|
|
531
|
+
|
|
297
532
|
function loadThread(id) {
|
|
298
533
|
var t = threads.filter(function (x) { return x.id === id; })[0];
|
|
299
|
-
|
|
534
|
+
// 账号历史行:不带 thread_token(登录态由节点半自动附账号 JWT,服务端按账号归属放行);
|
|
535
|
+
// 匿名/纯本地行:仍按原 thread_token 逻辑(带本地凭据访问)。
|
|
536
|
+
var accountRow = fbRowIsAccount(id);
|
|
537
|
+
if (!accountRow && !t) return;
|
|
300
538
|
setBusy("thread:" + id);
|
|
301
|
-
fbApi("/feedback/" + id, { token: t.token }).then(function (b) {
|
|
539
|
+
fbApi("/feedback/" + id, accountRow ? {} : { token: t.token }).then(function (b) {
|
|
302
540
|
setThreadData(b.feedback);
|
|
303
541
|
}).catch(function (e) {
|
|
304
|
-
setMsg("err", "
|
|
542
|
+
if (e && e.status === 401) setMsg("err", "登录已过期,请退出后重新登录后再查看该反馈");
|
|
543
|
+
else setMsg("err", "加载反馈详情失败:" + (e && e.message));
|
|
305
544
|
}).finally(function () { setBusy(""); });
|
|
306
545
|
}
|
|
307
546
|
|
|
547
|
+
/** 登录态拉取账号历史(/feedback/mine,翻页参数可用;节点半在登录态自动附 JWT)。 */
|
|
548
|
+
function loadMine() {
|
|
549
|
+
if (!fbAccount) return;
|
|
550
|
+
setMineBusy(true); setMineErr(false);
|
|
551
|
+
fbApi("/feedback/mine?page=1&page_size=20").then(function (b) {
|
|
552
|
+
setMineList((b && b.items) || []);
|
|
553
|
+
}).catch(function (e) {
|
|
554
|
+
setMineErr(true);
|
|
555
|
+
var eb = e && e.body && e.body.error;
|
|
556
|
+
setMsg("err", e && e.status === 401
|
|
557
|
+
? "账号登录已过期,请退出后重新登录,再查看账号全部历史"
|
|
558
|
+
: "账号历史拉取失败:" + ((eb && eb.message) || (e && e.message)) + "(本机记录仍可查看)");
|
|
559
|
+
}).finally(function () { setMineBusy(false); });
|
|
560
|
+
}
|
|
561
|
+
|
|
562
|
+
/** 合并展示列表:账号历史(服务端 mine,新→旧)在前;本机 thread_token 行去重后保留
|
|
563
|
+
* (匿名/本机新增但服务端未聚合的行仍可见,打开继续走本地凭据)。 */
|
|
564
|
+
function fbRows() {
|
|
565
|
+
var out = [];
|
|
566
|
+
var seen = {};
|
|
567
|
+
(mineList || []).forEach(function (it) {
|
|
568
|
+
seen[it.id] = true;
|
|
569
|
+
out.push({
|
|
570
|
+
id: it.id, acct: true,
|
|
571
|
+
status: it.status || "", category: it.category || "", title: it.title || "",
|
|
572
|
+
created_at: it.created_at || 0, reply_count: it.reply_count || 0,
|
|
573
|
+
});
|
|
574
|
+
});
|
|
575
|
+
threads.slice().reverse().forEach(function (t) {
|
|
576
|
+
if (seen[t.id]) return;
|
|
577
|
+
seen[t.id] = true;
|
|
578
|
+
out.push({ id: t.id, acct: false, status: "", category: "", title: "", created_at: 0, reply_count: 0 });
|
|
579
|
+
});
|
|
580
|
+
return out;
|
|
581
|
+
}
|
|
582
|
+
|
|
308
583
|
useEffect(function () { loadCfg(); }, [loadCfg]);
|
|
584
|
+
// 登录态打开「我的反馈」→ 拉账号历史;仅在未加载且非错误态自动触发(失败后点 tab 重试,不无限重试)
|
|
585
|
+
useEffect(function () {
|
|
586
|
+
if (tab === "mine" && fbAccount && mineList === null && !mineErr && !mineBusy) loadMine();
|
|
587
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
588
|
+
}, [tab, fbAccount, mineList === null, mineErr, mineBusy]);
|
|
309
589
|
|
|
310
590
|
var doSubmit = function () {
|
|
311
591
|
if (!fbContent.trim()) { setMsg("err", "请填写反馈内容"); return; }
|
|
@@ -316,12 +596,13 @@ window.__ModuleLoader__.load({
|
|
|
316
596
|
category: cat,
|
|
317
597
|
title: fbTitle.trim(),
|
|
318
598
|
content: fbContent.trim(),
|
|
319
|
-
contact: contact.trim() || (cfg && cfg.phone ? cfg.phone : ""),
|
|
599
|
+
contact: contact.trim() || ((cfg && cfg.phone && cfg.phone.indexOf("*") === -1) ? cfg.phone : ""),
|
|
320
600
|
};
|
|
321
601
|
fbApi("/feedback", { method: "POST", body: JSON.stringify(payload) })
|
|
322
602
|
.then(function (b) {
|
|
323
603
|
fbRememberThread(b.feedback.id, b.thread_token);
|
|
324
604
|
setThreads(fbLoadThreads());
|
|
605
|
+
if (fbAccount) setMineList(null); // 账号态提交成功 → 回「我的反馈」时重新拉取(含本条)
|
|
325
606
|
setFbTitle(""); setFbContent(""); setContact("");
|
|
326
607
|
setMsg("ok", "✅ 反馈已提交,可在「我的反馈」查看回复");
|
|
327
608
|
setTab("mine");
|
|
@@ -339,9 +620,15 @@ window.__ModuleLoader__.load({
|
|
|
339
620
|
var text = input ? input.value.trim() : "";
|
|
340
621
|
if (!text) { setMsg("err", "请填写回复内容"); return; }
|
|
341
622
|
var t = threads.filter(function (x) { return x.id === id; })[0];
|
|
342
|
-
|
|
623
|
+
var accountRow = fbRowIsAccount(id);
|
|
624
|
+
// 账号历史行:服务端回复(节点半自动附 JWT,无需本地 thread_token);本地/匿名行:带 thread_token 回复
|
|
625
|
+
var replyOpts = { method: "POST", body: JSON.stringify({ content: text }) };
|
|
626
|
+
if (!accountRow) {
|
|
627
|
+
if (!t) return;
|
|
628
|
+
replyOpts.token = t.token;
|
|
629
|
+
}
|
|
343
630
|
setBusy("reply:" + id);
|
|
344
|
-
fbApi("/feedback/" + id + "/replies",
|
|
631
|
+
fbApi("/feedback/" + id + "/replies", replyOpts)
|
|
345
632
|
.then(function () {
|
|
346
633
|
if (input) input.value = "";
|
|
347
634
|
loadThread(id);
|
|
@@ -349,7 +636,8 @@ window.__ModuleLoader__.load({
|
|
|
349
636
|
})
|
|
350
637
|
.catch(function (e) {
|
|
351
638
|
var errBody = e.body && e.body.error;
|
|
352
|
-
if (
|
|
639
|
+
if (e && e.status === 401) setMsg("err", "登录已过期,请重新登录后再回复");
|
|
640
|
+
else if (errBody && errBody.code === "rate_limited") setMsg("err", "今天回复次数已达上限,请明天再试");
|
|
353
641
|
else setMsg("err", "回复失败:" + (errBody && errBody.message ? errBody.message : e.message));
|
|
354
642
|
})
|
|
355
643
|
.finally(function () { setBusy(""); });
|
|
@@ -361,11 +649,83 @@ window.__ModuleLoader__.load({
|
|
|
361
649
|
if (id !== openId) loadThread(id);
|
|
362
650
|
};
|
|
363
651
|
|
|
652
|
+
/** 「我的反馈」tab 内容:账号历史行直接用服务端字段渲染(状态/类别/标题/时间/回复数),
|
|
653
|
+
* 并保留本机未同步的 thread_token 行;单条展开/回复由 loadThread/doReply 分流。 */
|
|
654
|
+
function renderMine() {
|
|
655
|
+
var rows = fbRows();
|
|
656
|
+
if (rows.length === 0) {
|
|
657
|
+
var emptyText = fbAccount
|
|
658
|
+
? (mineBusy ? "正在加载账号历史…" : (mineErr ? "账号历史加载失败,点上方「我的反馈」tab 重试" : "暂无反馈,提交第一条?"))
|
|
659
|
+
: "还没有提交过反馈。" + (cfg && cfg.reachable === false ? "(反馈服务未连接)" : "登录手机号账号后,可在任意设备查看账号全部历史。");
|
|
660
|
+
return h("div", null,
|
|
661
|
+
h("div", { className: "dru-fb-empty" }, emptyText),
|
|
662
|
+
fbMsg && h("div", { className: "dru-msg dru-msg-" + fbMsg.kind }, fbMsg.text)
|
|
663
|
+
);
|
|
664
|
+
}
|
|
665
|
+
return h("div", null,
|
|
666
|
+
rows.map(function (r) {
|
|
667
|
+
var open = openId === r.id;
|
|
668
|
+
var td = open ? threadData : null;
|
|
669
|
+
var st = td ? td.status : r.status;
|
|
670
|
+
var cat = td ? td.category : r.category;
|
|
671
|
+
var titleTxt = td ? (td.title || "") : r.title;
|
|
672
|
+
var ts = td ? td.created_at : r.created_at;
|
|
673
|
+
var catLbl = (function () {
|
|
674
|
+
var c = FB_CATEGORIES.filter(function (x) { return x.value === cat; })[0];
|
|
675
|
+
return c ? c.label : (cat || "反馈");
|
|
676
|
+
})();
|
|
677
|
+
return h("div", { key: r.id, className: "dru-fb-item" },
|
|
678
|
+
h("div", { className: "dru-fb-item-head" },
|
|
679
|
+
fbStatusBadge(st || "open"),
|
|
680
|
+
h("span", { className: "dru-fb-cat" }, catLbl),
|
|
681
|
+
h("span", { className: "dru-fb-item-title" }, titleTxt || ("反馈 #" + r.id.slice(-6))),
|
|
682
|
+
h("span", { className: "dru-fb-item-time" },
|
|
683
|
+
(ts ? new Date(ts).toLocaleString() : "") +
|
|
684
|
+
(r.acct && !open && r.reply_count > 0 ? " · " + r.reply_count + " 条回复" : ""))
|
|
685
|
+
),
|
|
686
|
+
open && td
|
|
687
|
+
? h("div", null,
|
|
688
|
+
h("div", { className: "dru-fb-item-content" }, td.content),
|
|
689
|
+
td.replies.map(function (reply) {
|
|
690
|
+
return h("div", { key: reply.id, className: "dru-fb-reply" },
|
|
691
|
+
h("div", { className: "dru-fb-reply-row" },
|
|
692
|
+
h("span", { className: "dru-fb-reply-who" + (reply.author === "user" ? " user" : "") }, reply.author === "admin" ? "管理员回复" : "我"),
|
|
693
|
+
h("span", { className: "dru-fb-reply-text" }, reply.content)
|
|
694
|
+
),
|
|
695
|
+
h("div", { className: "dru-fb-item-time" }, new Date(reply.created_at).toLocaleString())
|
|
696
|
+
);
|
|
697
|
+
}),
|
|
698
|
+
h("div", { className: "dru-fb-reply" },
|
|
699
|
+
h("textarea", { id: "dru-fb-reply-" + r.id, className: "dru-fb-reply-input", placeholder: "回复管理员…", maxLength: 2000 }),
|
|
700
|
+
h("div", { style: { textAlign: "right", marginTop: 6 } },
|
|
701
|
+
h("button", { type: "button", className: "dru-btn dru-btn-ghost", disabled: busy !== "", onClick: function () { doReply(r.id); } }, busy === "reply:" + r.id ? "发送中…" : "回复")
|
|
702
|
+
)
|
|
703
|
+
),
|
|
704
|
+
h("div", { className: "dru-fb-item-time", style: { textAlign: "right", marginTop: 8 } },
|
|
705
|
+
h("button", { type: "button", className: "dru-btn dru-btn-ghost", style: { padding: "2px 10px", fontSize: 12 }, disabled: busy !== "", onClick: function () { loadThread(r.id); } }, "↻ 刷新"),
|
|
706
|
+
" ",
|
|
707
|
+
h("button", { type: "button", className: "dru-btn dru-btn-ghost", style: { padding: "2px 10px", fontSize: 12 }, onClick: function () { setOpenId(""); setThreadData(null); } }, "收起")
|
|
708
|
+
)
|
|
709
|
+
)
|
|
710
|
+
: h("div", { className: "dru-fb-item-time", style: { textAlign: "right" } },
|
|
711
|
+
h("button", { type: "button", className: "dru-btn dru-btn-ghost", style: { padding: "2px 10px", fontSize: 12 }, disabled: busy !== "", onClick: function () { openThread(r.id); } }, open ? "收起" : "查看 / 回复"))
|
|
712
|
+
);
|
|
713
|
+
}),
|
|
714
|
+
mineBusy ? h("div", { className: "dru-hint", style: { marginTop: 6 } }, "账号历史同步中…") : null,
|
|
715
|
+
fbMsg && h("div", { className: "dru-msg dru-msg-" + fbMsg.kind }, fbMsg.text)
|
|
716
|
+
);
|
|
717
|
+
}
|
|
718
|
+
|
|
719
|
+
var mineRows = fbRows(); // 「我的反馈」展示行数:账号历史 + 本机未同步线程(合并去重后)
|
|
364
720
|
return h("div", { className: "dru-card" },
|
|
365
721
|
h("h3", null, "💬 用户反馈"),
|
|
366
722
|
h("div", { className: "dru-fb-tabs" },
|
|
367
723
|
h("div", { className: "dru-fb-tab" + (tab === "submit" ? " active" : ""), onClick: function () { setTab("submit"); setFbMsg(null); } }, "提交反馈"),
|
|
368
|
-
h("div", { className: "dru-fb-tab" + (tab === "mine" ? " active" : ""), onClick: function () {
|
|
724
|
+
h("div", { className: "dru-fb-tab" + (tab === "mine" ? " active" : ""), onClick: function () {
|
|
725
|
+
setTab("mine"); setFbMsg(null); setThreads(fbLoadThreads());
|
|
726
|
+
// 登录态(账号已配)打开「我的反馈」→ 拉取账号历史(合并展示,换设备/重装也能看到)
|
|
727
|
+
if (fbAccount && mineList === null) loadMine();
|
|
728
|
+
} }, "我的反馈" + (mineRows.length ? "(" + mineRows.length + ")" : ""))
|
|
369
729
|
),
|
|
370
730
|
tab === "submit"
|
|
371
731
|
? h("div", null,
|
|
@@ -393,52 +753,15 @@ window.__ModuleLoader__.load({
|
|
|
393
753
|
h("button", { type: "button", className: "dru-btn dru-btn-primary", style: { width: "100%" }, disabled: busy !== "", onClick: doSubmit }, busy === "submit" ? "提交中…" : "提交反馈"),
|
|
394
754
|
fbMsg && h("div", { className: "dru-msg dru-msg-" + fbMsg.kind }, fbMsg.text)
|
|
395
755
|
)
|
|
396
|
-
:
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
h("span", { className: "dru-fb-cat" }, (function () {
|
|
406
|
-
var c = FB_CATEGORIES.filter(function (x) { return x.value === (td ? td.category : ""); })[0];
|
|
407
|
-
return c ? c.label : (td ? td.category : "反馈");
|
|
408
|
-
})()),
|
|
409
|
-
h("span", { className: "dru-fb-item-title" }, td ? (td.title || "反馈") : "反馈 #" + t.id.slice(-6)),
|
|
410
|
-
h("span", { className: "dru-fb-item-time" }, td ? new Date(td.created_at).toLocaleString() : "")
|
|
411
|
-
),
|
|
412
|
-
open && td
|
|
413
|
-
? h("div", null,
|
|
414
|
-
h("div", { className: "dru-fb-item-content" }, td.content),
|
|
415
|
-
td.replies.map(function (r) {
|
|
416
|
-
return h("div", { key: r.id, className: "dru-fb-reply" },
|
|
417
|
-
h("div", { className: "dru-fb-reply-row" },
|
|
418
|
-
h("span", { className: "dru-fb-reply-who" + (r.author === "user" ? " user" : "") }, r.author === "admin" ? "管理员回复" : "我"),
|
|
419
|
-
h("span", { className: "dru-fb-reply-text" }, r.content)
|
|
420
|
-
),
|
|
421
|
-
h("div", { className: "dru-fb-item-time" }, new Date(r.created_at).toLocaleString())
|
|
422
|
-
);
|
|
423
|
-
}),
|
|
424
|
-
h("div", { className: "dru-fb-reply" },
|
|
425
|
-
h("textarea", { id: "dru-fb-reply-" + t.id, className: "dru-fb-reply-input", placeholder: "回复管理员…", maxLength: 2000 }),
|
|
426
|
-
h("div", { style: { textAlign: "right", marginTop: 6 } },
|
|
427
|
-
h("button", { type: "button", className: "dru-btn dru-btn-ghost", disabled: busy !== "", onClick: function () { doReply(t.id); } }, busy === "reply:" + t.id ? "发送中…" : "回复")
|
|
428
|
-
)
|
|
429
|
-
),
|
|
430
|
-
h("div", { className: "dru-fb-item-time", style: { textAlign: "right", marginTop: 8 } },
|
|
431
|
-
h("button", { type: "button", className: "dru-btn dru-btn-ghost", style: { padding: "2px 10px", fontSize: 12 }, disabled: busy !== "", onClick: function () { loadThread(t.id); } }, "↻ 刷新"),
|
|
432
|
-
" ",
|
|
433
|
-
h("button", { type: "button", className: "dru-btn dru-btn-ghost", style: { padding: "2px 10px", fontSize: 12 }, onClick: function () { setOpenId(""); setThreadData(null); } }, "收起")
|
|
434
|
-
)
|
|
435
|
-
)
|
|
436
|
-
: h("div", { className: "dru-fb-item-time", style: { textAlign: "right" } },
|
|
437
|
-
h("button", { type: "button", className: "dru-btn dru-btn-ghost", style: { padding: "2px 10px", fontSize: 12 }, disabled: busy !== "", onClick: function () { openThread(t.id); } }, open ? "收起" : "查看 / 回复"))
|
|
438
|
-
);
|
|
439
|
-
}),
|
|
440
|
-
fbMsg && h("div", { className: "dru-msg dru-msg-" + fbMsg.kind }, fbMsg.text)
|
|
441
|
-
)
|
|
756
|
+
: renderMine(),
|
|
757
|
+
// 反馈页底部:企微交流群二维码(后台上传后出现;未配置不展示)
|
|
758
|
+
comm && comm.qrcode
|
|
759
|
+
? h("div", { className: "dru-fb-community" },
|
|
760
|
+
h("div", { className: "dru-fb-community-title" }, "💬 加入企微交流群"),
|
|
761
|
+
h("div", { className: "dru-hint", style: { marginBottom: 8 } }, "扫码入群:安装答疑 / 使用技巧 / 版本更新 / 问题反馈"),
|
|
762
|
+
h("img", { className: "dru-community-qr", src: comm.qrcode, alt: "企微交流群二维码" }),
|
|
763
|
+
comm.wechat ? h("div", { className: "dru-hint", style: { marginTop: 8 } }, "二维码失效或群满,可加客服微信:" + comm.wechat) : null)
|
|
764
|
+
: null
|
|
442
765
|
);
|
|
443
766
|
}
|
|
444
767
|
|
|
@@ -524,7 +847,7 @@ window.__ModuleLoader__.load({
|
|
|
524
847
|
var payload = {
|
|
525
848
|
kind: "rating",
|
|
526
849
|
category: "satisfaction",
|
|
527
|
-
content: note.trim() || (rating >= 4 ? "
|
|
850
|
+
content: note.trim() || (rating >= 4 ? "对远程访问功能满意" : "对远程访问功能不太满意"),
|
|
528
851
|
rating: rating,
|
|
529
852
|
recommend: recommend === true ? 1 : 0,
|
|
530
853
|
};
|
|
@@ -536,6 +859,7 @@ window.__ModuleLoader__.load({
|
|
|
536
859
|
.catch(function (e) {
|
|
537
860
|
var errBody = e.body && e.body.error;
|
|
538
861
|
if (errBody && errBody.code === "rate_limited") { fbPopupLater(); setMessage({ kind: "err", text: "今日提交已达上限,明天再来吧" }); }
|
|
862
|
+
else if (errBody && errBody.code === "already_rated") { fbPopupDone(); setMessage({ kind: "ok", text: "你已评价过,感谢支持(同一账号/设备只收集一次)" }); }
|
|
539
863
|
else setMessage({ kind: "err", text: "提交失败:" + ((errBody && errBody.message) || e.message) + "(可稍后再试)" });
|
|
540
864
|
})
|
|
541
865
|
.finally(function () { setBusy(""); });
|
|
@@ -547,7 +871,7 @@ window.__ModuleLoader__.load({
|
|
|
547
871
|
step === "rate"
|
|
548
872
|
? h("div", null,
|
|
549
873
|
h("div", { className: "dru-popup-icon" }, "😊"),
|
|
550
|
-
h("div", { className: "dru-popup-title" }, "
|
|
874
|
+
h("div", { className: "dru-popup-title" }, "您对远程访问功能满意吗?"),
|
|
551
875
|
h("div", { className: "dru-popup-sub" }, "使用体验已满 1 小时,说说真实感受吧(1 分钟搞定)"),
|
|
552
876
|
h("div", { className: "dru-popup-rate" },
|
|
553
877
|
[ [5, "😄", "很满意"], [3, "😐", "一般"], [1, "😞", "不满意"] ].map(function (r) {
|
|
@@ -609,8 +933,8 @@ window.__ModuleLoader__.load({
|
|
|
609
933
|
}
|
|
610
934
|
|
|
611
935
|
// ── 图标 ────────────────────────────────────────────────────────────────
|
|
612
|
-
//
|
|
613
|
-
//
|
|
936
|
+
// 「远程访问」栏目图标沿用面板 emoji 图标体系:📱 更贴合“手机/另一台电脑远程访问”语义
|
|
937
|
+
// (原 🖥 已随入口迁移调整);栏目导航 label 与栏目头部均使用它。
|
|
614
938
|
|
|
615
939
|
// ── 版本与更新卡片(自管理:市场没有更新按钮,这里提供在线一键更新/彻底卸载) ──
|
|
616
940
|
// 数据来自 node 半新增的 /dsh-remote/self* 路由;逻辑均在插件 node 半实现,
|
|
@@ -766,10 +1090,30 @@ window.__ModuleLoader__.load({
|
|
|
766
1090
|
selfMsg ? h("div", { className: "dru-msg dru-msg-" + selfMsg.kind }, selfMsg.text) : null,
|
|
767
1091
|
h("div", { className: "dru-hint", style: { marginTop: 8 } },
|
|
768
1092
|
armed ? "⚠ 再次点击后即开始彻底卸载:① 移除 dsh web 配置中的插件引用与本地文件;② 停止并移除 bridge 自启动服务(macOS com.dshremote.bridge / Linux dsh-bridge)并结束残留进程;③ 清空本地配置目录(~/.dsh-remote:账号、设备密钥、固化运行时等)。此操作不可撤销,如需再次使用请在插件市场重新安装。" :
|
|
769
|
-
"
|
|
1093
|
+
"检测新版、一键在线更新、彻底卸载都在本卡片完成。")
|
|
770
1094
|
);
|
|
771
1095
|
}
|
|
772
1096
|
|
|
1097
|
+
// ── 端到端加密(E2EE,Phase-5):bridge 状态 → 可读文案映射 ─────────────
|
|
1098
|
+
// bridge 启停时把开关结果写入 <relayDir>/.e2ee-state.json({enabled,reason,profile,epoch,caps},
|
|
1099
|
+
// 见 clients/dsh-remote/e2ee-client.mjs),node 半随 /dsh-remote/status 以 service.e2ee 下发;
|
|
1100
|
+
// 此处只做“可读文案”映射(协议 docs/e2ee-protocol.md §2.3/§7.3)。
|
|
1101
|
+
var E2EE_DISABLED_COPY = {
|
|
1102
|
+
server_disabled: "端到端加密暂不可用(当前为普通安全连接 HTTPS)",
|
|
1103
|
+
params_unreachable: "当前为普通安全连接(HTTPS)",
|
|
1104
|
+
disabled_by_config: "当前为普通安全连接(HTTPS)",
|
|
1105
|
+
derive_failed: "账号密码已变更,需在「🔑 账号」重新登录后恢复端到端加密(当前为普通安全连接(HTTPS))",
|
|
1106
|
+
};
|
|
1107
|
+
var E2EE_DISABLED_FALLBACK = "当前为普通安全连接(HTTPS)";
|
|
1108
|
+
/** 把 service.e2ee 归一化为可读状态行;e2ee 缺失/旧 host 未下发 → null(不打扰)。 */
|
|
1109
|
+
function describeE2ee(e2ee) {
|
|
1110
|
+
if (!e2ee || typeof e2ee !== "object") return null;
|
|
1111
|
+
if (e2ee.enabled === true) return { kind: "ok", text: "🔒 端到端加密已启用(手机解锁后生效)" };
|
|
1112
|
+
var reason = typeof e2ee.reason === "string" && e2ee.reason ? e2ee.reason : "";
|
|
1113
|
+
var text = E2EE_DISABLED_COPY[reason] || E2EE_DISABLED_FALLBACK; // reason 未知 → 兜底
|
|
1114
|
+
return { kind: "off", text: text };
|
|
1115
|
+
}
|
|
1116
|
+
|
|
773
1117
|
// ── 面板主体(渲染于设置页 settings.section 栏目内) ─────────────────────
|
|
774
1118
|
function RemoteControlSection(props) {
|
|
775
1119
|
|
|
@@ -807,6 +1151,31 @@ window.__ModuleLoader__.load({
|
|
|
807
1151
|
var shArr = useState(""); var selfHost = shArr[0]; var setSelfHost = shArr[1];
|
|
808
1152
|
var lkArr = useState(""); var localKey = lkArr[0]; var setLocalKey = lkArr[1];
|
|
809
1153
|
|
|
1154
|
+
// ── 📱 远程访问卡(一次性访问密钥 + 已授权设备管理)——放在全部既有字段之后,保持既有 hook 序号 ──
|
|
1155
|
+
var akeyArr = useState(null); var akey = akeyArr[0]; var setAkey = akeyArr[1]; // {url,key,expires_at,ttl_ms,qr_data_url}
|
|
1156
|
+
var akeyBusyArr = useState(false); var akeyBusy = akeyBusyArr[0]; var setAkeyBusy = akeyBusyArr[1];
|
|
1157
|
+
var akeyMsgArr = useState(null); var akeyMsg = akeyMsgArr[0]; var setAkeyMsg = akeyMsgArr[1]; // {kind,text}
|
|
1158
|
+
var nowTickArr = useState(function () { return Date.now(); }); var nowTick = nowTickArr[0]; var setNowTick = nowTickArr[1];
|
|
1159
|
+
var copiedKeyArr = useState(false); var copiedKey = copiedKeyArr[0]; var setCopiedKey = copiedKeyArr[1];
|
|
1160
|
+
var devSessArr = useState(null); var devSessions = devSessArr[0]; var setDevSessions = devSessArr[1]; // null=未加载
|
|
1161
|
+
var devOpenArr = useState(false); var devOpen = devOpenArr[0]; var setDevOpen = devOpenArr[1];
|
|
1162
|
+
var devBusyArr = useState(""); var devBusy = devBusyArr[0]; var setDevBusy = devBusyArr[1];
|
|
1163
|
+
var devMsgArr = useState(null); var devMsg = devMsgArr[0]; var setDevMsg = devMsgArr[1];
|
|
1164
|
+
var armedDevArr = useState(null); var armedDev = armedDevArr[0]; var setArmedDev = armedDevArr[1]; // 待二次确认的 session id(取消配对)
|
|
1165
|
+
var armedDelArr = useState(null); var armedDel = armedDelArr[0]; var setArmedDel = armedDelArr[1]; // 待二次确认的 session id(删除记录)
|
|
1166
|
+
var purgeArmedArr = useState(false); var purgeArmed = purgeArmedArr[0]; var setPurgeArmed = purgeArmedArr[1]; // 清理已解绑二次确认
|
|
1167
|
+
// ── 🔒 修改密码(已登录 SaaS,短信重置)状态:放在全部既有字段之后,保持既有 hook 序号 ──
|
|
1168
|
+
// 成功后企业端使该账号全部授权设备/会话失效(含 E2EE 派生口令)→ 本地登出、用新密码重新登录。
|
|
1169
|
+
var pwdOpenArr = useState(false); var pwdOpen = pwdOpenArr[0]; var setPwdOpen = pwdOpenArr[1]; // 小表单展开
|
|
1170
|
+
var pwdCapArr = useState(null); var pwdCap = pwdCapArr[0]; var setPwdCap = pwdCapArr[1]; // {id,svg} 图形验证码
|
|
1171
|
+
var pwdCapTxtArr = useState(""); var pwdCapTxt = pwdCapTxtArr[0]; var setPwdCapTxt = pwdCapTxtArr[1];
|
|
1172
|
+
var pwdSmsArr = useState(""); var pwdSms = pwdSmsArr[0]; var setPwdSms = pwdSmsArr[1];
|
|
1173
|
+
var pwdSmsBtnArr = useState("获取验证码"); var pwdSmsBtn = pwdSmsBtnArr[0]; var setPwdSmsBtn = pwdSmsBtnArr[1];
|
|
1174
|
+
var pwdNewArr = useState(""); var pwdNew = pwdNewArr[0]; var setPwdNew = pwdNewArr[1]; // 新密码(≥8)
|
|
1175
|
+
// ── 💬 交流群(「加入交流群」按钮 + 弹窗):同样放在全部既有字段之后 ──
|
|
1176
|
+
var communityArr = useState(null); var community = communityArr[0]; var setCommunity = communityArr[1]; // {qrcode,wechat};null=未加载
|
|
1177
|
+
var commOpenArr = useState(false); var commOpen = commOpenArr[0]; var setCommOpen = commOpenArr[1];
|
|
1178
|
+
|
|
810
1179
|
var refresh = useCallback(function () {
|
|
811
1180
|
setBusy("status");
|
|
812
1181
|
api("/dsh-remote/status").then(function (body) {
|
|
@@ -833,6 +1202,8 @@ window.__ModuleLoader__.load({
|
|
|
833
1202
|
|
|
834
1203
|
var loggedIn = !!(st && st.config && (st.config.phone || st.config.hasLocalKey));
|
|
835
1204
|
var serviceRunning = !!(st && st.service && st.service.running);
|
|
1205
|
+
// 账号标识(掩码手机号):登录成功/换账号时变化 → 触发上方的重取 effect(比布尔 loggedIn 更敏感)
|
|
1206
|
+
var phoneKey = (st && st.config && st.config.phone) || "";
|
|
836
1207
|
var launchdPid = st && st.service && st.service.launchd && st.service.launchd.pid;
|
|
837
1208
|
|
|
838
1209
|
// 已登录(SaaS)→ 拉我的信息/配额/公共配置
|
|
@@ -844,9 +1215,301 @@ window.__ModuleLoader__.load({
|
|
|
844
1215
|
}, [st && st.config && st.config.phone]);
|
|
845
1216
|
|
|
846
1217
|
useEffect(function () { refresh(); }, [refresh]);
|
|
1218
|
+
|
|
1219
|
+
// 交流群二维码(后台上传即可展示;未配置 → community.qrcode 为空,入口不出现)
|
|
1220
|
+
useEffect(function () {
|
|
1221
|
+
var alive = true;
|
|
1222
|
+
loadCommunity().then(function (d) { if (alive) setCommunity(d); });
|
|
1223
|
+
return function () { alive = false; };
|
|
1224
|
+
}, []);
|
|
1225
|
+
useEffect(function () {
|
|
1226
|
+
// 展开「忘记密码」重置表单时不用预载登录表单验证码(收起的 reset 表单用独立 pwdCap)
|
|
1227
|
+
if (st !== null && !loggedIn && mode === "saas" && authTab === "login" && !pwdOpen && !lcap) loadCaptcha("login");
|
|
1228
|
+
}, [st, loggedIn, mode, authTab, pwdOpen, lcap]);
|
|
1229
|
+
|
|
1230
|
+
// ── 📱 远程访问卡:常量 / 轮询 / 一次性访问密钥 / 已授权设备 ─────────────────
|
|
1231
|
+
var KEY_AUTO_REFRESH_MS = 25000; // 停留栏目时约每 25s 自动轮换一把新的一次性密钥(防已用/过期)
|
|
1232
|
+
var STATUS_POLL_MS = 30000; // 连接状态行轮询间隔(审计降频:原 5s→30s;页面隐藏时暂停)
|
|
1233
|
+
|
|
1234
|
+
/** 轻量状态轮询:只更新 st,不改 mode(mode 由用户 Tab 选择决定,避免轮询把自建/云端来回切)。 */
|
|
1235
|
+
function pollStatus() {
|
|
1236
|
+
if (document.hidden) return; // 页面隐藏时不空转(审计:降低请求频率)
|
|
1237
|
+
api("/dsh-remote/status").then(function (body) {
|
|
1238
|
+
if (!body || !body.ok) return;
|
|
1239
|
+
setSt(body);
|
|
1240
|
+
}).catch(function () {});
|
|
1241
|
+
}
|
|
1242
|
+
|
|
1243
|
+
// 时间工具(兼容 epoch 毫秒 / ISO 字符串 / 数字字符串)
|
|
1244
|
+
function toMs(ts) {
|
|
1245
|
+
if (ts === null || ts === undefined || ts === "") return 0;
|
|
1246
|
+
var n = Number(ts);
|
|
1247
|
+
if (String(ts).trim() !== "" && isFinite(n)) return n;
|
|
1248
|
+
var d = new Date(ts);
|
|
1249
|
+
return isNaN(d.getTime()) ? 0 : d.getTime();
|
|
1250
|
+
}
|
|
1251
|
+
function pad2(n) { return String(n).padStart(2, "0"); }
|
|
1252
|
+
function fmtClock(ts) {
|
|
1253
|
+
var ms = toMs(ts);
|
|
1254
|
+
if (!ms) return "--:--:--";
|
|
1255
|
+
var d = new Date(ms);
|
|
1256
|
+
if (isNaN(d.getTime())) return "--:--:--";
|
|
1257
|
+
return pad2(d.getHours()) + ":" + pad2(d.getMinutes()) + ":" + pad2(d.getSeconds());
|
|
1258
|
+
}
|
|
1259
|
+
function fmtRemain(ms) {
|
|
1260
|
+
var s = Math.max(0, Math.floor((ms || 0) / 1000));
|
|
1261
|
+
var h = Math.floor(s / 3600), m = Math.floor((s % 3600) / 60), sec = s % 60;
|
|
1262
|
+
return (h > 0 ? pad2(h) + ":" : "") + pad2(m) + ":" + pad2(sec);
|
|
1263
|
+
}
|
|
1264
|
+
function fmtDT(ts) {
|
|
1265
|
+
var ms = toMs(ts);
|
|
1266
|
+
if (!ms) return "—";
|
|
1267
|
+
var d = new Date(ms);
|
|
1268
|
+
if (isNaN(d.getTime())) return "—";
|
|
1269
|
+
return d.getFullYear() + "-" + pad2(d.getMonth() + 1) + "-" + pad2(d.getDate()) + " " + pad2(d.getHours()) + ":" + pad2(d.getMinutes());
|
|
1270
|
+
}
|
|
1271
|
+
|
|
1272
|
+
/**
|
|
1273
|
+
* 创建(或刷新)一次性访问密钥:GET /dsh-remote/access-key(node 半转发企业端 /api/auth-key)。
|
|
1274
|
+
* 失败自愈:中继未就绪类失败(node 半 retryable / 网络 / 5xx)按退避自动重试,
|
|
1275
|
+
* 见「登录后首次加载自愈」——首次安装立即登录时不再需要手动刷新页面。
|
|
1276
|
+
*/
|
|
1277
|
+
function loadAccessKey() {
|
|
1278
|
+
if (akeyInFlight.v) return;
|
|
1279
|
+
// 登录前不请求企业端(避免 401/404 噪音);由账号登录成功后触发
|
|
1280
|
+
if (!(st && st.config && st.config.phone)) {
|
|
1281
|
+
setAkeyMsg(null);
|
|
1282
|
+
cancelAkeyRetry();
|
|
1283
|
+
return;
|
|
1284
|
+
}
|
|
1285
|
+
akeyInFlight.v = true;
|
|
1286
|
+
setAkeyBusy(true);
|
|
1287
|
+
api("/dsh-remote/access-key").then(function (b) {
|
|
1288
|
+
if (!b || !b.ok) {
|
|
1289
|
+
var why = (b && (b.error || (b.body && b.body.error))) || "未知错误";
|
|
1290
|
+
var e = new Error(why); e.body = b || null;
|
|
1291
|
+
throw e;
|
|
1292
|
+
}
|
|
1293
|
+
// 契约容错:url 必须有;qr_data_url 取不到时仍展示链接/复制/直接打开
|
|
1294
|
+
if (!b.url) {
|
|
1295
|
+
setAkeyMsg({ kind: "err", text: "获取一次性访问地址失败:企业端未返回可用链接" });
|
|
1296
|
+
return;
|
|
1297
|
+
}
|
|
1298
|
+
setAkey({
|
|
1299
|
+
url: b.url || "",
|
|
1300
|
+
key: b.key != null ? b.key : null,
|
|
1301
|
+
expires_at: b.expires_at != null ? b.expires_at : null,
|
|
1302
|
+
ttl_ms: b.ttl_ms != null ? b.ttl_ms : null,
|
|
1303
|
+
qr_data_url: b.qr_data_url != null ? b.qr_data_url : null
|
|
1304
|
+
});
|
|
1305
|
+
setAkeyMsg(null);
|
|
1306
|
+
akeyRetry.attempt = 0;
|
|
1307
|
+
}).catch(function (e) {
|
|
1308
|
+
var text = "获取一次性访问地址失败:" + e.message;
|
|
1309
|
+
if (retryableFail(e) && akeyRetry.attempt < LOGIN_LOAD_RETRY_MS.length) {
|
|
1310
|
+
scheduleAkeyRetry(text);
|
|
1311
|
+
return;
|
|
1312
|
+
}
|
|
1313
|
+
// 自动重试额度用尽(或不该重试)→ 红字 + 「立即重试」入口,不让用户只能刷新页面
|
|
1314
|
+
setAkeyMsg({ kind: "err", text: text, retry: retryAkeyManually });
|
|
1315
|
+
}).finally(function () { akeyInFlight.v = false; setAkeyBusy(false); });
|
|
1316
|
+
}
|
|
1317
|
+
|
|
1318
|
+
var copyKeyUrl = function () {
|
|
1319
|
+
if (!(akey && akey.url)) return;
|
|
1320
|
+
try {
|
|
1321
|
+
navigator.clipboard.writeText(akey.url).then(function () {
|
|
1322
|
+
setCopiedKey(true);
|
|
1323
|
+
setTimeout(function () { setCopiedKey(false); }, 1500);
|
|
1324
|
+
});
|
|
1325
|
+
} catch (e) {}
|
|
1326
|
+
};
|
|
1327
|
+
/** 「直接打开」:浏览器新标签打开一次性访问地址(打开即扫码/点击进入)。 */
|
|
1328
|
+
var openKeyUrl = function () {
|
|
1329
|
+
if (!(akey && akey.url)) return;
|
|
1330
|
+
try { window.open(akey.url, "_blank", "noopener"); } catch (e) {}
|
|
1331
|
+
};
|
|
1332
|
+
|
|
1333
|
+
/** 加载已授权设备列表:GET /dsh-remote/mobile-sessions(失败同上:可重试类自动重试)。 */
|
|
1334
|
+
function loadDevices() {
|
|
1335
|
+
if (devInFlight.v || devBusy !== "") return;
|
|
1336
|
+
devInFlight.v = true;
|
|
1337
|
+
setDevBusy("list");
|
|
1338
|
+
api("/dsh-remote/mobile-sessions").then(function (b) {
|
|
1339
|
+
if (!b || !b.ok) throw new Error((b && b.error) || "加载已授权设备失败");
|
|
1340
|
+
setDevSessions(Array.isArray(b.sessions) ? b.sessions : []);
|
|
1341
|
+
setDevMsg(null);
|
|
1342
|
+
devRetry.attempt = 0;
|
|
1343
|
+
}).catch(function (e) {
|
|
1344
|
+
var text = "加载已授权设备失败:" + e.message;
|
|
1345
|
+
if (retryableFail(e) && devRetry.attempt < LOGIN_LOAD_RETRY_MS.length) {
|
|
1346
|
+
scheduleDevRetry(text);
|
|
1347
|
+
return;
|
|
1348
|
+
}
|
|
1349
|
+
setDevMsg({ kind: "err", text: text, retry: retryDevicesManually });
|
|
1350
|
+
}).finally(function () { devInFlight.v = false; setDevBusy(""); });
|
|
1351
|
+
}
|
|
1352
|
+
/** 手动重试(红字旁的「重试」按钮):重置退避计数后立即重新拉取。 */
|
|
1353
|
+
var retryAkeyManually = function () {
|
|
1354
|
+
cancelAkeyRetry();
|
|
1355
|
+
akeyRetry.attempt = 0;
|
|
1356
|
+
setAkeyMsg(null);
|
|
1357
|
+
loadAccessKey();
|
|
1358
|
+
};
|
|
1359
|
+
var retryDevicesManually = function () {
|
|
1360
|
+
cancelDevRetry();
|
|
1361
|
+
devRetry.attempt = 0;
|
|
1362
|
+
setDevMsg(null);
|
|
1363
|
+
loadDevices();
|
|
1364
|
+
};
|
|
1365
|
+
/** 定时重试一次性访问密钥(黄字提示 + 退避;成功时由 loadAccessKey 清掉提示)。 */
|
|
1366
|
+
function scheduleAkeyRetry(why) {
|
|
1367
|
+
cancelAkeyRetry();
|
|
1368
|
+
var wait = LOGIN_LOAD_RETRY_MS[akeyRetry.attempt] || LOGIN_LOAD_RETRY_MS[LOGIN_LOAD_RETRY_MS.length - 1];
|
|
1369
|
+
akeyRetry.attempt += 1;
|
|
1370
|
+
setAkeyMsg({
|
|
1371
|
+
kind: "warn",
|
|
1372
|
+
text: "中继连接尚未就绪," + Math.round(wait / 1000) + " 秒后自动重试(第 " + akeyRetry.attempt + "/" + LOGIN_LOAD_RETRY_MS.length + " 次):" + why,
|
|
1373
|
+
retry: retryAkeyManually
|
|
1374
|
+
});
|
|
1375
|
+
akeyRetry.timer = later(function () {
|
|
1376
|
+
akeyRetry.timer = null;
|
|
1377
|
+
loadAccessKey(); // 在途标记由上一个请求的 finally 释放,退避窗口内用户也可手动刷新
|
|
1378
|
+
}, wait);
|
|
1379
|
+
}
|
|
1380
|
+
/** 定时重试已授权设备列表(同上)。 */
|
|
1381
|
+
function scheduleDevRetry(why) {
|
|
1382
|
+
cancelDevRetry();
|
|
1383
|
+
var wait = LOGIN_LOAD_RETRY_MS[devRetry.attempt] || LOGIN_LOAD_RETRY_MS[LOGIN_LOAD_RETRY_MS.length - 1];
|
|
1384
|
+
devRetry.attempt += 1;
|
|
1385
|
+
setDevMsg({
|
|
1386
|
+
kind: "warn",
|
|
1387
|
+
text: "中继连接尚未就绪," + Math.round(wait / 1000) + " 秒后自动重试(第 " + devRetry.attempt + "/" + LOGIN_LOAD_RETRY_MS.length + " 次):" + why,
|
|
1388
|
+
retry: retryDevicesManually
|
|
1389
|
+
});
|
|
1390
|
+
devRetry.timer = later(function () {
|
|
1391
|
+
devRetry.timer = null;
|
|
1392
|
+
loadDevices();
|
|
1393
|
+
}, wait);
|
|
1394
|
+
}
|
|
1395
|
+
/** 操作(取消配对/删除记录/清理已解绑)成功后静默重拉列表,覆盖行内状态。 */
|
|
1396
|
+
function refreshDeviceList() {
|
|
1397
|
+
api("/dsh-remote/mobile-sessions").then(function (b) {
|
|
1398
|
+
if (b && b.ok) setDevSessions(Array.isArray(b.sessions) ? b.sessions : []);
|
|
1399
|
+
}).catch(function () {});
|
|
1400
|
+
}
|
|
1401
|
+
|
|
1402
|
+
var toggleDevices = function () {
|
|
1403
|
+
var next = !devOpen;
|
|
1404
|
+
setDevOpen(next);
|
|
1405
|
+
if (next && devSessions === null && devBusy === "") loadDevices();
|
|
1406
|
+
if (!next) { setArmedDev(null); setArmedDel(null); setPurgeArmed(false); }
|
|
1407
|
+
};
|
|
1408
|
+
|
|
1409
|
+
/** 取消配对:先点一次进入确认态,再点一次才 POST revoke(同 SelfManageCard 二次确认风格)。 */
|
|
1410
|
+
var doRevokeDevice = function (id) {
|
|
1411
|
+
if (!id) return;
|
|
1412
|
+
if (armedDev !== id) { setArmedDev(id); setArmedDel(null); setPurgeArmed(false); return; }
|
|
1413
|
+
setDevBusy("revoke:" + id);
|
|
1414
|
+
post("/dsh-remote/mobile-sessions/revoke", { id: id }).then(function (b) {
|
|
1415
|
+
if (!b || !b.ok) throw new Error((b && (b.error || (b.body && b.body.error))) || "取消失败");
|
|
1416
|
+
setArmedDev(null);
|
|
1417
|
+
setDevMsg({ kind: "ok", text: "已取消,对方需重新扫码/登录" });
|
|
1418
|
+
refreshDeviceList();
|
|
1419
|
+
}).catch(function (e) {
|
|
1420
|
+
setArmedDev(null);
|
|
1421
|
+
setDevMsg({ kind: "err", text: "取消配对失败:" + e.message });
|
|
1422
|
+
}).finally(function () { setDevBusy(""); });
|
|
1423
|
+
};
|
|
1424
|
+
|
|
1425
|
+
/**
|
|
1426
|
+
* 删除设备记录:任意行(含已取消/历史)都可用,整行删除并拉黑 jti——
|
|
1427
|
+
* DELETE /dsh-remote/mobile-sessions/delete(body {id} → 企业端 DELETE /api/mobile-sessions/:id)。
|
|
1428
|
+
* 先点一次进入确认态,再点一次才发请求。
|
|
1429
|
+
*/
|
|
1430
|
+
var doDeleteDevice = function (id) {
|
|
1431
|
+
if (!id) return;
|
|
1432
|
+
if (armedDel !== id) { setArmedDel(id); setArmedDev(null); setPurgeArmed(false); return; }
|
|
1433
|
+
setDevBusy("delete:" + id);
|
|
1434
|
+
api("/dsh-remote/mobile-sessions/delete", {
|
|
1435
|
+
method: "DELETE",
|
|
1436
|
+
headers: { "content-type": "application/json" },
|
|
1437
|
+
body: JSON.stringify({ id: id })
|
|
1438
|
+
}).then(function (b) {
|
|
1439
|
+
if (!b || !b.ok) throw new Error((b && (b.error || (b.body && b.body.error))) || "删除失败");
|
|
1440
|
+
setArmedDel(null);
|
|
1441
|
+
setDevMsg({ kind: "ok", text: "已删除该设备的记录" });
|
|
1442
|
+
refreshDeviceList();
|
|
1443
|
+
}).catch(function (e) {
|
|
1444
|
+
setArmedDel(null);
|
|
1445
|
+
setDevMsg({ kind: "err", text: "删除记录失败:" + e.message });
|
|
1446
|
+
}).finally(function () { setDevBusy(""); });
|
|
1447
|
+
};
|
|
1448
|
+
|
|
1449
|
+
/**
|
|
1450
|
+
* 清理已解绑:删除本人全部 revoked 行——POST /dsh-remote/mobile-sessions/purge(企业端 purge)。
|
|
1451
|
+
* 先点一次进入确认态,再点一次才发请求;成功后刷新列表并提示清理条数。
|
|
1452
|
+
*/
|
|
1453
|
+
var doPurgeDevices = function () {
|
|
1454
|
+
if (!purgeArmed) { setPurgeArmed(true); setArmedDev(null); setArmedDel(null); return; }
|
|
1455
|
+
setDevBusy("purge");
|
|
1456
|
+
post("/dsh-remote/mobile-sessions/purge", {}).then(function (b) {
|
|
1457
|
+
if (!b || !b.ok) throw new Error((b && (b.error || (b.body && b.body.error))) || "清理失败");
|
|
1458
|
+
setPurgeArmed(false);
|
|
1459
|
+
var n = b.removed != null ? Number(b.removed) : 0;
|
|
1460
|
+
setDevMsg({ kind: "ok", text: n > 0 ? ("已清理 " + n + " 条已解绑记录") : "已清理全部已解绑记录" });
|
|
1461
|
+
refreshDeviceList();
|
|
1462
|
+
}).catch(function (e) {
|
|
1463
|
+
setPurgeArmed(false);
|
|
1464
|
+
setDevMsg({ kind: "err", text: "清理失败:" + e.message });
|
|
1465
|
+
}).finally(function () { setDevBusy(""); });
|
|
1466
|
+
};
|
|
1467
|
+
|
|
1468
|
+
/** 升级/续费带登录态打开:取一次性访问 url,改写为 /app/promo?auth=… 后在手机端进入续费页。 */
|
|
1469
|
+
var openUpgradeAuth = function () {
|
|
1470
|
+
setBusy("upgrade");
|
|
1471
|
+
api("/dsh-remote/access-key").then(function (b) {
|
|
1472
|
+
if (!b || !b.ok || !b.url) throw new Error((b && b.error) || "生成访问链接失败");
|
|
1473
|
+
var promo = promoUrlOf(b.url);
|
|
1474
|
+
try { window.open(promo, "_blank", "noopener"); } catch (e2) {}
|
|
1475
|
+
setMsg("ok", "✅ 升级/续费页已在新标签页打开(带登录态)");
|
|
1476
|
+
}).catch(function (e) {
|
|
1477
|
+
setMsg("err", "打开升级/续费页失败:" + e.message);
|
|
1478
|
+
}).finally(function () { setBusy(""); });
|
|
1479
|
+
};
|
|
1480
|
+
|
|
1481
|
+
// 停留主视图(home)时:轮询连接状态(15s,审计降频) + 每秒刷新倒计时;隐藏暂停、回前台立即刷新
|
|
847
1482
|
useEffect(function () {
|
|
848
|
-
if (
|
|
849
|
-
|
|
1483
|
+
if (view !== "home") return;
|
|
1484
|
+
var pollIv = setInterval(function () { pollStatus(); }, STATUS_POLL_MS);
|
|
1485
|
+
var tickIv = setInterval(function () { setNowTick(Date.now()); }, 1000);
|
|
1486
|
+
var visFn = function () { if (!document.hidden) pollStatus(); };
|
|
1487
|
+
document.addEventListener("visibilitychange", visFn);
|
|
1488
|
+
return function () {
|
|
1489
|
+
clearInterval(pollIv);
|
|
1490
|
+
clearInterval(tickIv);
|
|
1491
|
+
document.removeEventListener("visibilitychange", visFn);
|
|
1492
|
+
};
|
|
1493
|
+
}, [view]);
|
|
1494
|
+
|
|
1495
|
+
// 已登录云端主视图停留期间:打开即取一把新 key + 已授权设备;之后每 ~25s 自动轮换
|
|
1496
|
+
// (未登录不轮询,避免 401 空转;离开栏目/切视图/退出登录即清理定时器)
|
|
1497
|
+
//
|
|
1498
|
+
// 依赖里带上「账号」与「bridge 运行态」:登录成功(含换账号)与 bridge 拉起/重启后立即重取,
|
|
1499
|
+
// 首次安装后立即登录不再需要手动刷新页面;失败重试由 loadAccessKey/loadDevices 内部退避处理。
|
|
1500
|
+
useEffect(function () {
|
|
1501
|
+
if (view !== "home" || mode !== "saas" || !loggedIn) return undefined;
|
|
1502
|
+
cancelAkeyRetry(); cancelDevRetry();
|
|
1503
|
+
akeyRetry.attempt = 0; devRetry.attempt = 0;
|
|
1504
|
+
loadAccessKey();
|
|
1505
|
+
loadDevices();
|
|
1506
|
+
var rotateIv = setInterval(function () { loadAccessKey(); }, KEY_AUTO_REFRESH_MS);
|
|
1507
|
+
return function () {
|
|
1508
|
+
clearInterval(rotateIv);
|
|
1509
|
+
cancelAkeyRetry();
|
|
1510
|
+
cancelDevRetry();
|
|
1511
|
+
};
|
|
1512
|
+
}, [view, mode, loggedIn, phoneKey, serviceRunning]);
|
|
850
1513
|
|
|
851
1514
|
function setMsg(kind, text) { setMessage({ kind: kind, text: text }); }
|
|
852
1515
|
|
|
@@ -862,6 +1525,7 @@ window.__ModuleLoader__.load({
|
|
|
862
1525
|
return post("/dsh-remote/config", { phone: phone.trim(), password: pass }).then(function (cfg) {
|
|
863
1526
|
// 切换连接账号(手机号与之前不同):清除旧账号留下的反馈线程凭据
|
|
864
1527
|
if (prevPhone !== phone.trim()) fbClearThreads();
|
|
1528
|
+
setPwdOpen(false); // 登录成功(可能从「忘记密码」返回)→ 收起重置表单
|
|
865
1529
|
setSt(cfg); setPass(""); setLcapTxt(""); setLcap(null);
|
|
866
1530
|
setMsg("ok", "✅ 登录成功,账号已保存");
|
|
867
1531
|
});
|
|
@@ -912,6 +1576,7 @@ window.__ModuleLoader__.load({
|
|
|
912
1576
|
.then(function (body) {
|
|
913
1577
|
if (body.ok || body.status === 201 || (body.body && body.body.token)) {
|
|
914
1578
|
return post("/dsh-remote/config", { phone: rphone.trim(), password: rpass }).then(function (cfg) {
|
|
1579
|
+
setPwdOpen(false);
|
|
915
1580
|
setSt(cfg);
|
|
916
1581
|
setRphone(""); setRpass(""); setRpass2(""); setRsms(""); setRcap(null); setRcapTxt(""); setRInvite("");
|
|
917
1582
|
setMsg("ok", "✅ 注册成功,已自动登录");
|
|
@@ -928,15 +1593,120 @@ window.__ModuleLoader__.load({
|
|
|
928
1593
|
setBusy("logout");
|
|
929
1594
|
post("/dsh-remote/logout").then(function (body) {
|
|
930
1595
|
setSt(body); setAccount(null); setQuota(null);
|
|
1596
|
+
// 清空一次性访问密钥/二维码/授权设备等本地状态(退出后不得残留可见)
|
|
1597
|
+
setAkey(null); setAkeyMsg(null);
|
|
931
1598
|
// 退出登录:清除本机保存的用户反馈线程凭据(thread_token 见 FB_THREADS_KEY),
|
|
932
1599
|
// 反馈历史保留在服务端(按账号校验),账号身份变化后本机不再可见旧线程。
|
|
933
1600
|
fbClearThreads();
|
|
1601
|
+
setPwdOpen(false); // 退出登录后回到登录卡,收起重置/修改密码表单
|
|
934
1602
|
if (clearForm) { setPhone(""); setPass(""); setLcapTxt(""); setLcap(null); setRphone(""); setRpass(""); setRpass2(""); setRsms(""); setRsmsBtn("获取验证码"); setRcapTxt(""); setRcap(null); }
|
|
935
1603
|
setMessage(null);
|
|
936
1604
|
}).catch(function (e) { setMsg("err", "退出失败: " + e.message); })
|
|
937
1605
|
.finally(function () { setBusy(""); });
|
|
938
1606
|
};
|
|
939
1607
|
|
|
1608
|
+
// ---------- 🔒 修改密码 / 忘记密码(共用:短信验证码重置;企业端公开 POST /api/password/reset) ----------
|
|
1609
|
+
// 图形验证码 + 短信验证码复用既有 /dsh-remote/captcha、/dsh-remote/sms-code 防刷路径;
|
|
1610
|
+
// 新密码 ≥8 位。成功后企业端使全部授权设备/会话失效(含 E2EE 派生口令)→ 本地登出,
|
|
1611
|
+
// 提示用新密码重新登录(登录成功会把新密码写回本地 config,覆盖旧口令并重建 E2EE 派生)。
|
|
1612
|
+
// 两处入口共用同一组字段/函数(pwdOpen/pwdCap/pwdCapTxt/pwdSms/pwdSmsBtn/pwdNew 与
|
|
1613
|
+
// togglePwdForm/sendPwdSms/doResetPwd/renderResetPwdForm,避免重复实现):
|
|
1614
|
+
// - 账号卡「🔒 修改密码」:fromLogin=false,手机号以当前登录账号为准(只读);
|
|
1615
|
+
// - 登录卡「忘记密码?」:fromLogin=true,手机号预填登录输入、可改;成功后请用新密码登录。
|
|
1616
|
+
var PWD_RESET_WARN = "修改后所有已授权设备/会话将失效,需重新登录与解锁";
|
|
1617
|
+
|
|
1618
|
+
function pwdLoadCaptcha() {
|
|
1619
|
+
setPwdCap({ id: null, svg: '<span class="dru-hint">加载中</span>' });
|
|
1620
|
+
fetch("/dsh-remote/captcha").then(function (r) {
|
|
1621
|
+
return r.text().then(function (text) {
|
|
1622
|
+
if (!r.ok) throw new Error("http " + r.status);
|
|
1623
|
+
var body = null; try { body = JSON.parse(text); } catch (e) { body = null; }
|
|
1624
|
+
if (body && body.captcha_id) setPwdCap({ id: body.captcha_id, svg: body.svg || "" });
|
|
1625
|
+
else if (body && body.svg) setPwdCap({ id: null, svg: body.svg });
|
|
1626
|
+
else setPwdCap({ id: null, svg: null });
|
|
1627
|
+
});
|
|
1628
|
+
}).catch(function () { setPwdCap({ id: null, svg: null }); });
|
|
1629
|
+
}
|
|
1630
|
+
/** 展开/收起重置密码表单(账号卡「修改密码」与登录卡「忘记密码」共用开关)。 */
|
|
1631
|
+
var togglePwdForm = function () {
|
|
1632
|
+
var next = !pwdOpen;
|
|
1633
|
+
setPwdOpen(next);
|
|
1634
|
+
setMessage(null);
|
|
1635
|
+
if (next && !pwdCap) pwdLoadCaptcha();
|
|
1636
|
+
};
|
|
1637
|
+
/** 发送短信验证码(图形验证码防刷;captcha_invalid → 重载验证码提示重试)。ph 由调用方给出:
|
|
1638
|
+
* 账号卡=当前登录手机号;登录卡「忘记密码」=表单输入手机号。 */
|
|
1639
|
+
var sendPwdSms = function (ph) {
|
|
1640
|
+
ph = String(ph || "").trim();
|
|
1641
|
+
// 账号卡改密(隐私契约):phone 为空 = 由服务端取本机账号真号发码;仅当显式填了非法号才报错
|
|
1642
|
+
if (ph && !/^1\d{10}$/.test(ph)) { setMsg("err", "请输入正确的手机号"); return; }
|
|
1643
|
+
if (!pwdCap || !pwdCap.id || !pwdCapTxt.trim()) { setMsg("err", "请输入图中验证码(点击图片可刷新)"); return; }
|
|
1644
|
+
setBusy("pwd-sms");
|
|
1645
|
+
post("/dsh-remote/sms-code", { phone: ph, captcha_id: pwdCap.id, captcha_answer: pwdCapTxt.trim() })
|
|
1646
|
+
.then(function (body) {
|
|
1647
|
+
var testCode = body && (body.test_code || (body.body && body.body.test_code));
|
|
1648
|
+
setPwdCap(null); setPwdCapTxt(""); // 验证码一次性:发送后失效
|
|
1649
|
+
if (testCode) setMsg("ok", "验证码已发送(测试码: " + testCode + ")");
|
|
1650
|
+
else setMsg("ok", "验证码已发送");
|
|
1651
|
+
var s = 60; setPwdSmsBtn(s + "s");
|
|
1652
|
+
var t = setInterval(function () { s--; if (s <= 0) { clearInterval(t); setPwdSmsBtn("获取验证码"); } else setPwdSmsBtn(s + "s"); }, 1000);
|
|
1653
|
+
})
|
|
1654
|
+
.catch(function (e) {
|
|
1655
|
+
var relayError = e.body && e.body.body && e.body.body.error;
|
|
1656
|
+
if (relayError && relayError.code === "captcha_invalid") {
|
|
1657
|
+
setPwdCapTxt(""); pwdLoadCaptcha();
|
|
1658
|
+
setMsg("err", "发送次数较多,请输入图中验证码后重试");
|
|
1659
|
+
} else setMsg("err", "发送失败: " + e.message);
|
|
1660
|
+
})
|
|
1661
|
+
.finally(function () { setBusy(""); });
|
|
1662
|
+
};
|
|
1663
|
+
/**
|
|
1664
|
+
* 确认重置密码:POST /dsh-remote/password/reset → 成功后本地登出,提示用新密码登录。
|
|
1665
|
+
* @param {string} ph - 手机号(账号卡=当前登录账号;登录卡「忘记密码」=表单输入)。
|
|
1666
|
+
* @param {boolean} fromLogin - true=登录卡「忘记密码」;false=账号卡「修改密码」。
|
|
1667
|
+
*/
|
|
1668
|
+
var doResetPwd = function (ph, fromLogin) {
|
|
1669
|
+
ph = String(ph || "").trim();
|
|
1670
|
+
if (ph && !/^1\d{10}$/.test(ph)) { setMsg("err", "请输入正确的手机号"); return; }
|
|
1671
|
+
if (!ph && fromLogin) { setMsg("err", "请输入正确的手机号"); return; } // 登录卡忘记密码必须显式填号
|
|
1672
|
+
if (!pwdSms.trim()) { setMsg("err", "请填写短信验证码"); return; }
|
|
1673
|
+
if (pwdNew.length < 8) { setMsg("err", "新密码至少 8 位"); return; }
|
|
1674
|
+
setBusy("pwd-reset");
|
|
1675
|
+
post("/dsh-remote/password/reset", { phone: ph, sms_code: pwdSms.trim(), new_password: pwdNew })
|
|
1676
|
+
.then(function (body) {
|
|
1677
|
+
var ok = !!(body && (body.ok === true || (body.body && body.body.ok === true)));
|
|
1678
|
+
if (!ok) {
|
|
1679
|
+
var relayBody = (body && body.body) || body || {};
|
|
1680
|
+
var errText = (relayBody.error && (relayBody.error.message || relayBody.error))
|
|
1681
|
+
|| relayBody.detail || ("修改失败(" + ((body && body.status) || "?") + ")");
|
|
1682
|
+
setMsg("err", (fromLogin ? "重置失败:" : "修改失败:") + String(errText));
|
|
1683
|
+
setPwdSms(""); // 短信验证码一次性:失败后需重新获取
|
|
1684
|
+
return undefined;
|
|
1685
|
+
}
|
|
1686
|
+
// 成功:全部授权设备/会话已失效(含 E2EE)→ 本地登出清掉 config 旧口令与本地凭据,
|
|
1687
|
+
// 提示用新密码重新登录(登录会把新口令写入 config 并重启 bridge / 重建 E2EE)。
|
|
1688
|
+
setBusy("pwd-logout");
|
|
1689
|
+
return post("/dsh-remote/logout").then(function (lb) {
|
|
1690
|
+
setSt(lb); setAccount(null); setQuota(null);
|
|
1691
|
+
setAkey(null); setAkeyMsg(null);
|
|
1692
|
+
fbClearThreads();
|
|
1693
|
+
setPwdOpen(false); setPwdSms(""); setPwdNew(""); setPwdCap(null); setPwdCapTxt(""); setPwdSmsBtn("获取验证码");
|
|
1694
|
+
if (fromLogin) {
|
|
1695
|
+
// 「忘记密码」成功:本机登出完成 → 回到登录表单提示用新密码登录(手机号保留,便于直接重登)
|
|
1696
|
+
setPass(""); setLcapTxt(""); setLcap(null); loadCaptcha("login");
|
|
1697
|
+
setMsg("ok", "✅ 密码已重置成功:" + PWD_RESET_WARN + ",本机已退出登录。请用新密码登录。");
|
|
1698
|
+
} else {
|
|
1699
|
+
setMsg("ok", "✅ 密码已修改成功:所有已授权设备与会话已失效,本机已退出登录。" +
|
|
1700
|
+
"请在下方账号卡用「新密码」重新登录——登录会更新本机保存的密码并重新启用端到端加密(E2EE)。");
|
|
1701
|
+
}
|
|
1702
|
+
}).catch(function (e) {
|
|
1703
|
+
setMsg("err", "密码已" + (fromLogin ? "重置" : "修改") + "成功,但本机退出登录失败:" + e.message + "(建议手动「退出登录」后用新密码重新登录,以更新本机配置密码)");
|
|
1704
|
+
});
|
|
1705
|
+
})
|
|
1706
|
+
.catch(function (e) { setMsg("err", (fromLogin ? "重置失败: " : "修改失败: ") + e.message); })
|
|
1707
|
+
.finally(function () { setBusy(""); });
|
|
1708
|
+
};
|
|
1709
|
+
|
|
940
1710
|
var toggleBridge = function (start) {
|
|
941
1711
|
setBusy(start ? "start" : "stop");
|
|
942
1712
|
post(start ? "/dsh-remote/start" : "/dsh-remote/stop")
|
|
@@ -948,11 +1718,6 @@ window.__ModuleLoader__.load({
|
|
|
948
1718
|
.finally(function () { setBusy(""); });
|
|
949
1719
|
};
|
|
950
1720
|
|
|
951
|
-
var copyUrl = function () {
|
|
952
|
-
if (!st) return;
|
|
953
|
-
try { navigator.clipboard.writeText(st.remoteUrl).then(function () { setCopied(true); setTimeout(function () { setCopied(false); }, 1500); }); } catch (e) {}
|
|
954
|
-
};
|
|
955
|
-
|
|
956
1721
|
var saveLocal = function () {
|
|
957
1722
|
if (!selfHost.trim() || !localKey.trim()) { setMsg("err", "请填写服务器地址与访问密钥"); return; }
|
|
958
1723
|
setBusy("local");
|
|
@@ -960,6 +1725,7 @@ window.__ModuleLoader__.load({
|
|
|
960
1725
|
.then(function (body) {
|
|
961
1726
|
// 切换到自建服务(连接账号上下文变为本地无账号):清除 SaaS 账号的反馈线程凭据
|
|
962
1727
|
fbClearThreads();
|
|
1728
|
+
setPwdOpen(false);
|
|
963
1729
|
setSt(body); setSelfHost(""); setLocalKey("");
|
|
964
1730
|
setMsg(body.ok ? "ok" : "err", body.ok ? "✅ 已切换到自建服务,bridge 已重启" : (body.error || (body.body && body.body.error) || "保存失败"));
|
|
965
1731
|
})
|
|
@@ -991,12 +1757,6 @@ window.__ModuleLoader__.load({
|
|
|
991
1757
|
if (!ts) return "—";
|
|
992
1758
|
try { var d = new Date(Number(ts)); return d.getFullYear() + "-" + String(d.getMonth() + 1).padStart(2, "0") + "-" + String(d.getDate()).padStart(2, "0"); } catch (e) { return "—"; }
|
|
993
1759
|
}
|
|
994
|
-
/** 推广/升级页地址(/app/promo),取不到时返回空(按钮隐藏)。 */
|
|
995
|
-
function promoUrl() {
|
|
996
|
-
var base = (pub && pub.app_url) || (st && st.remoteUrl) || "";
|
|
997
|
-
if (!base) return "";
|
|
998
|
-
return base.replace(/\/+$/, "") + "/promo";
|
|
999
|
-
}
|
|
1000
1760
|
function renderAccount() {
|
|
1001
1761
|
var a = account;
|
|
1002
1762
|
var plan = a ? a.plan : "free";
|
|
@@ -1004,7 +1764,6 @@ window.__ModuleLoader__.load({
|
|
|
1004
1764
|
var isMember = plan === "pro" || plan === "pro_max";
|
|
1005
1765
|
var endsAt = a && (a.plan_ends_at || a.trial_expires_at) ? Number(a.plan_ends_at || a.trial_expires_at) : 0;
|
|
1006
1766
|
var quotaPct = quota && quota.limit_enabled ? quota.percent : null;
|
|
1007
|
-
var promo = promoUrl();
|
|
1008
1767
|
var planText;
|
|
1009
1768
|
if (!isMember) planText = "免费额度: 带宽 ≈1Mbps" + (quotaPct !== null ? " · 本月流量已用 " + quotaPct + "%" : " · 本月流量限额 1GB");
|
|
1010
1769
|
else if (source === "trial") planText = "试用 PRO 会员 · 到期 " + fmtDate(a.trial_expires_at);
|
|
@@ -1024,15 +1783,57 @@ window.__ModuleLoader__.load({
|
|
|
1024
1783
|
h("span", null, planText)
|
|
1025
1784
|
),
|
|
1026
1785
|
h("div", { className: "dru-actions", style: { marginTop: 10 } },
|
|
1027
|
-
|
|
1028
|
-
!isMember ? "🚀 升级 PRO" : source === "trial" ? "🚀 转正式 PRO" : "🔄 续费会员"),
|
|
1786
|
+
h("button", { type: "button", className: "dru-btn dru-btn-primary", style: { display: "inline-flex", alignItems: "center" }, disabled: busy !== "", title: "升级/续费(带登录态打开)", onClick: openUpgradeAuth },
|
|
1787
|
+
busy === "upgrade" ? "生成链接中…" : (!isMember ? "🚀 升级 PRO" : source === "trial" ? "🚀 转正式 PRO" : "🔄 续费会员")),
|
|
1029
1788
|
h("button", { type: "button", className: "dru-btn dru-btn-ghost", disabled: busy !== "", onClick: function () { setView("invite"); loadInvite(); } }, "🎯 邀请好友赚会员"),
|
|
1030
1789
|
h("button", { type: "button", className: "dru-btn dru-btn-ghost", disabled: busy !== "", onClick: function () { setView("feedback"); } }, "💬 用户反馈"),
|
|
1790
|
+
h("button", { type: "button", className: "dru-btn dru-btn-ghost", disabled: busy !== "", onClick: togglePwdForm }, pwdOpen ? "收起修改密码" : "🔒 修改密码"),
|
|
1031
1791
|
h("button", { type: "button", className: "dru-btn dru-btn-danger", disabled: busy !== "", onClick: function () { doLogout(false); } }, "退出登录")
|
|
1032
1792
|
),
|
|
1033
|
-
|
|
1034
|
-
"
|
|
1035
|
-
|
|
1793
|
+
h("div", { className: "dru-hint", style: { marginTop: 8 } },
|
|
1794
|
+
"升级/续费以带登录态方式打开:点击后生成一次性访问链接并直接跳转,无需重新登录。" +
|
|
1795
|
+
(endsAt && isMember ? "到期后如需继续使用会员权益,请在到期前续费。" : "")),
|
|
1796
|
+
pwdOpen ? renderResetPwdForm(false) : null
|
|
1797
|
+
);
|
|
1798
|
+
}
|
|
1799
|
+
|
|
1800
|
+
// ---------- 🔒 修改密码 / 忘记密码 共用重置表单(图形验证码 + 短信验证码 + 新密码≥8) ----------
|
|
1801
|
+
// fromLogin=false:账号卡「修改密码」手机号以当前登录账号为准(只读);
|
|
1802
|
+
// fromLogin=true:登录卡「忘记密码」手机号预填登录输入、可改(成功后返回登录表单请用新密码登录)。
|
|
1803
|
+
function renderResetPwdForm(fromLogin) {
|
|
1804
|
+
// 隐私审计(2026-09):账号卡「修改密码」手机号只展示掩码;发送/重置时由服务端取本机账号真实号,
|
|
1805
|
+
// 浏览器端不再出现明文手机号。登录卡「忘记密码」为用户自行输入,原样使用。
|
|
1806
|
+
var curPhone = ((st && st.config && st.config.phone) || "");
|
|
1807
|
+
var ph = fromLogin ? phone : "";
|
|
1808
|
+
return h("div", { className: "dru-card", style: { marginTop: 10, border: "1px dashed #d0d7de" } },
|
|
1809
|
+
h("h3", null, fromLogin ? "忘记密码(短信重置)" : "🔒 修改密码(短信验证)"),
|
|
1810
|
+
h("div", { className: "dru-hint", style: { marginBottom: 8 } },
|
|
1811
|
+
fromLogin
|
|
1812
|
+
? "手机号预填当前输入,可改为其它账号;" + PWD_RESET_WARN + "。"
|
|
1813
|
+
: PWD_RESET_WARN + "(E2EE 用新密码重新派生)。"),
|
|
1814
|
+
field("手机号", fromLogin
|
|
1815
|
+
? input({ type: "tel", value: ph, placeholder: "11 位手机号", autoComplete: "tel", onChange: function (e) { setPhone(e.target.value); } })
|
|
1816
|
+
: h("input", { className: "dru-input", type: "tel", value: curPhone, disabled: true, readOnly: true, title: "以当前登录账号为准" })),
|
|
1817
|
+
field("图形验证码", h("div", { className: "dru-captcha" },
|
|
1818
|
+
input({ value: pwdCapTxt, placeholder: "图中数字", autoComplete: "off", inputMode: "numeric", maxLength: 6, onChange: function (e) { setPwdCapTxt(e.target.value); } }),
|
|
1819
|
+
h("div", { className: "dru-captcha-box", title: "看不清?点击刷新", onClick: function () { pwdLoadCaptcha(); }, dangerouslySetInnerHTML: pwdCap && pwdCap.svg && pwdCap.svg.indexOf("<svg") === 0 ? { __html: pwdCap.svg } : void 0 },
|
|
1820
|
+
pwdCap && pwdCap.svg && pwdCap.svg.indexOf("<svg") !== 0 ? pwdCap.svg : null)
|
|
1821
|
+
)),
|
|
1822
|
+
field("短信验证码", h("div", { className: "dru-captcha" },
|
|
1823
|
+
input({ value: pwdSms, placeholder: "6 位验证码", autoComplete: "off", inputMode: "numeric", maxLength: 6, onChange: function (e) { setPwdSms(e.target.value); } }),
|
|
1824
|
+
h("button", { type: "button", className: "dru-btn dru-btn-ghost", style: { flex: "none", padding: "0 14px" }, disabled: busy !== "", onClick: function () { sendPwdSms(ph); } }, pwdSmsBtn)
|
|
1825
|
+
)),
|
|
1826
|
+
field("新密码(至少 8 位)", input({ type: "password", value: pwdNew, minLength: 8, autoComplete: "new-password", placeholder: "至少 8 位", onChange: function (e) { setPwdNew(e.target.value); } })),
|
|
1827
|
+
h("div", { className: "dru-hint", style: { marginBottom: 8 } },
|
|
1828
|
+
fromLogin
|
|
1829
|
+
? "重置成功后本机会退出登录(如有已保存的旧账号),请用新密码登录。"
|
|
1830
|
+
: "修改成功后,本机保存的旧密码会被清除并退出登录;请用新密码重新登录(登录会更新本机配置密码并重新启用远程访问与端到端加密)。"),
|
|
1831
|
+
h("button", { type: "button", className: "dru-btn dru-btn-danger", style: { width: "100%" }, disabled: busy !== "", onClick: function () { doResetPwd(ph, fromLogin); } },
|
|
1832
|
+
busy === "pwd-reset" ? "提交中…" : busy === "pwd-logout" ? "已重置,正在退出本地登录…" : (fromLogin ? "确认重置密码" : "确认修改密码")),
|
|
1833
|
+
fromLogin
|
|
1834
|
+
? h("div", { style: { textAlign: "right", marginTop: 6 } },
|
|
1835
|
+
h("button", { type: "button", className: "dru-linkbtn", onClick: function () { togglePwdForm(); } }, "← 返回登录"))
|
|
1836
|
+
: null
|
|
1036
1837
|
);
|
|
1037
1838
|
}
|
|
1038
1839
|
|
|
@@ -1087,6 +1888,174 @@ window.__ModuleLoader__.load({
|
|
|
1087
1888
|
);
|
|
1088
1889
|
}
|
|
1089
1890
|
|
|
1891
|
+
// ---------- 📱 远程访问卡:一次性访问地址 / 二维码 / 状态行 ----------
|
|
1892
|
+
function renderAccessCard() {
|
|
1893
|
+
var hasKey = !!(akey && akey.url);
|
|
1894
|
+
var expMs = akey ? toMs(akey.expires_at) : 0;
|
|
1895
|
+
var remainMs = expMs ? expMs - nowTick : 0;
|
|
1896
|
+
var loggedInSaaS = !!(st && st.config && st.config.phone);
|
|
1897
|
+
var statusTxt = st === null
|
|
1898
|
+
? "查询中…"
|
|
1899
|
+
: !loggedInSaaS
|
|
1900
|
+
? "请先登录(下方账号卡片)后启用远程访问"
|
|
1901
|
+
: serviceRunning ? "已连接(可远程访问)" : "等待设备连接";
|
|
1902
|
+
var dotCls = "dru-dot " + (loggedInSaaS && serviceRunning ? "dru-dot-on" : "dru-dot-off");
|
|
1903
|
+
// Phase-5:端到端加密(E2EE)状态行 —— 未登录/旧 host 未下发 e2ee 一律不渲染
|
|
1904
|
+
// (桌面宽屏与手机镜像共用同一面板:纯文字状态行、不弹层不打扰);启用=绿点绿字(🔒已启用),
|
|
1905
|
+
// 未启用=灰字 + 中性原因文案(回退普通 HTTPS 连接,不宣称“灰度等待”)。
|
|
1906
|
+
function renderE2eeBadge() {
|
|
1907
|
+
if (!loggedInSaaS) return null;
|
|
1908
|
+
var e = describeE2ee(st && st.service && st.service.e2ee);
|
|
1909
|
+
if (!e) return null;
|
|
1910
|
+
return h("div", { className: "dru-e2ee-line" + (e.kind === "ok" ? " ok" : "") },
|
|
1911
|
+
h("span", { className: "dru-dot " + (e.kind === "ok" ? "dru-dot-on" : "dru-dot-off") }),
|
|
1912
|
+
h("span", null, e.text));
|
|
1913
|
+
}
|
|
1914
|
+
return card("📱 远程访问", [
|
|
1915
|
+
h("div", { className: "dru-status-line" },
|
|
1916
|
+
h("span", { className: dotCls }),
|
|
1917
|
+
h("span", null, statusTxt)
|
|
1918
|
+
),
|
|
1919
|
+
renderE2eeBadge(),
|
|
1920
|
+
akeyMsg
|
|
1921
|
+
? h("div", { className: "dru-msg dru-msg-" + akeyMsg.kind, style: { marginTop: 8 } },
|
|
1922
|
+
akeyMsg.text,
|
|
1923
|
+
akeyMsg.retry
|
|
1924
|
+
? h("button", { type: "button", className: "dru-linkbtn", style: { marginLeft: 8 }, disabled: akeyBusy, onClick: akeyMsg.retry }, akeyBusy ? "重试中…" : "立即重试")
|
|
1925
|
+
: null)
|
|
1926
|
+
: null,
|
|
1927
|
+
hasKey ? h("div", null, [
|
|
1928
|
+
h("div", { className: "dru-url big", style: { marginTop: 8 } },
|
|
1929
|
+
h("span", null, akey.url),
|
|
1930
|
+
h("button", { type: "button", onClick: copyKeyUrl }, copiedKey ? "已复制" : "复制")
|
|
1931
|
+
),
|
|
1932
|
+
h("div", { className: "dru-access-flex" },
|
|
1933
|
+
h("div", { className: "dru-access-col", style: { alignItems: "center" } },
|
|
1934
|
+
akey.qr_data_url
|
|
1935
|
+
? h("img", { className: "dru-qr-img", src: akey.qr_data_url, alt: "远程访问二维码" })
|
|
1936
|
+
: h("div", { className: "dru-qr-ph" }, "二维码生成中 / 暂不可用\n链接仍可复制或直接打开"),
|
|
1937
|
+
h("div", { className: "dru-cd" + (remainMs > 0 ? " dru-cd-ok" : "") },
|
|
1938
|
+
"有效至 " + fmtClock(akey.expires_at) + " · 剩余 " + fmtRemain(remainMs))
|
|
1939
|
+
),
|
|
1940
|
+
h("div", { className: "dru-access-col" },
|
|
1941
|
+
h("div", { className: "dru-key-note" },
|
|
1942
|
+
"扫码即进入,30 分钟有效、用一次即失效。"),
|
|
1943
|
+
h("div", { className: "dru-actions", style: { marginTop: 2 } },
|
|
1944
|
+
h("button", { type: "button", className: "dru-btn dru-btn-primary", disabled: akeyBusy, onClick: openKeyUrl }, "直接打开"),
|
|
1945
|
+
h("button", { type: "button", className: "dru-btn dru-btn-ghost", disabled: akeyBusy, onClick: loadAccessKey }, akeyBusy ? "生成中…" : "刷新二维码/访问链接")
|
|
1946
|
+
),
|
|
1947
|
+
h("div", { className: "dru-hint", style: { marginTop: 4 } },
|
|
1948
|
+
!serviceRunning
|
|
1949
|
+
? "本机 bridge 未运行:先在下方「🖥 Bridge 服务」卡启动。"
|
|
1950
|
+
: "打开链接/扫码进入即登录态;同设备重复扫码只更新授权,不新增设备。")
|
|
1951
|
+
)
|
|
1952
|
+
)
|
|
1953
|
+
]) : h("div", null, [
|
|
1954
|
+
h("div", { className: "dru-hint", style: { marginTop: 6 } },
|
|
1955
|
+
loggedInSaaS
|
|
1956
|
+
? "正在生成一次性访问链接…(手机或另一台电脑扫码/打开即可进入)"
|
|
1957
|
+
: "登录下方「🔑 账号」卡片中的手机号账号后,即可生成一次性访问链接,让手机或另一台电脑远程使用同一份 dsh web。"),
|
|
1958
|
+
h("div", { className: "dru-actions", style: { marginTop: 8 } },
|
|
1959
|
+
h("button", { type: "button", className: "dru-btn dru-btn-primary", disabled: akeyBusy, onClick: loadAccessKey },
|
|
1960
|
+
akeyBusy ? "生成中…" : "生成访问链接")
|
|
1961
|
+
)
|
|
1962
|
+
])
|
|
1963
|
+
]);
|
|
1964
|
+
}
|
|
1965
|
+
|
|
1966
|
+
// ---------- 📲 已授权设备卡(展开列表 + 行内 取消配对/删除记录 + 底部 清理已解绑) ----------
|
|
1967
|
+
function deviceLabel(s) {
|
|
1968
|
+
if (s && s.label) return String(s.label);
|
|
1969
|
+
var parts = [];
|
|
1970
|
+
if (s && s.os) parts.push(String(s.os));
|
|
1971
|
+
if (s && s.browser) parts.push(String(s.browser));
|
|
1972
|
+
return parts.length ? parts.join(" ") : "未知设备";
|
|
1973
|
+
}
|
|
1974
|
+
function deviceMeta(s) {
|
|
1975
|
+
var parts = [];
|
|
1976
|
+
if (s && s.os) parts.push(String(s.os));
|
|
1977
|
+
if (s && s.browser) parts.push(String(s.browser));
|
|
1978
|
+
return parts.join(" · ");
|
|
1979
|
+
}
|
|
1980
|
+
function renderDeviceList() {
|
|
1981
|
+
if (devSessions === null) {
|
|
1982
|
+
return h("div", { className: "dru-hint" }, devBusy === "list" ? "正在加载已授权设备…" : "加载已授权设备中,请稍候或点上方按钮重试");
|
|
1983
|
+
}
|
|
1984
|
+
if (devSessions.length === 0) {
|
|
1985
|
+
return h("div", { className: "dru-fb-empty" }, "暂无已授权设备(手机扫码后出现)");
|
|
1986
|
+
}
|
|
1987
|
+
var revokedCount = devSessions.filter(function (s) { return !!(s && s.revoked_at); }).length;
|
|
1988
|
+
return h("div", null, [
|
|
1989
|
+
devSessions.map(function (s) {
|
|
1990
|
+
var id = s && s.id;
|
|
1991
|
+
var revoked = !!(s && s.revoked_at);
|
|
1992
|
+
return h("div", { key: id, className: "dru-dev" },
|
|
1993
|
+
h("div", { className: "dru-dev-top" },
|
|
1994
|
+
h("span", { className: "dru-dev-name" }, deviceLabel(s)),
|
|
1995
|
+
deviceMeta(s) ? h("span", { className: "dru-dev-meta" }, deviceMeta(s)) : null,
|
|
1996
|
+
revoked ? h("span", { className: "dru-dev-tag dru-dev-tag-off" }, "已取消配对") : null
|
|
1997
|
+
),
|
|
1998
|
+
h("div", { className: "dru-dev-sub" },
|
|
1999
|
+
"首次配对 " + fmtDT(s && s.created_at) +
|
|
2000
|
+
(s && s.last_seen_at ? " · 最近活跃 " + fmtDT(s.last_seen_at) : "") +
|
|
2001
|
+
(revoked ? " · 取消于 " + fmtDT(s.revoked_at) : "")
|
|
2002
|
+
),
|
|
2003
|
+
h("div", { className: "dru-actions", style: { marginTop: 8 } },
|
|
2004
|
+
revoked ? null : h("button", {
|
|
2005
|
+
type: "button",
|
|
2006
|
+
className: "dru-btn dru-btn-danger",
|
|
2007
|
+
disabled: devBusy !== "",
|
|
2008
|
+
onClick: function () { doRevokeDevice(id); }
|
|
2009
|
+
}, devBusy === "revoke:" + id ? "取消中…" : armedDev === id ? "⚠ 再点一次确认取消配对" : "取消配对"),
|
|
2010
|
+
h("button", {
|
|
2011
|
+
type: "button",
|
|
2012
|
+
className: "dru-btn dru-btn-ghost",
|
|
2013
|
+
style: { color: "#cf222e", borderColor: "#cf222e" },
|
|
2014
|
+
disabled: devBusy !== "",
|
|
2015
|
+
onClick: function () { doDeleteDevice(id); }
|
|
2016
|
+
}, devBusy === "delete:" + id ? "删除中…" : armedDel === id ? "⚠ 再点一次确认删除记录" : "删除记录")
|
|
2017
|
+
)
|
|
2018
|
+
);
|
|
2019
|
+
}),
|
|
2020
|
+
h("div", { className: "dru-hint", style: { marginTop: 4 } },
|
|
2021
|
+
"取消配对后,对方需重新扫码/登录才能再次远程访问本机。"),
|
|
2022
|
+
h("div", { className: "dru-actions", style: { marginTop: 8, borderTop: "1px dashed #eaeef2", paddingTop: 8 } },
|
|
2023
|
+
h("button", {
|
|
2024
|
+
type: "button",
|
|
2025
|
+
className: "dru-btn dru-btn-ghost",
|
|
2026
|
+
disabled: devBusy !== "" || revokedCount === 0,
|
|
2027
|
+
onClick: doPurgeDevices,
|
|
2028
|
+
title: revokedCount > 0 ? ("清理 " + revokedCount + " 条已解绑记录") : "没有已解绑记录"
|
|
2029
|
+
}, devBusy === "purge" ? "清理中…" : purgeArmed ? "⚠ 再点一次确认清理已解绑" : "清理已解绑" + (revokedCount > 0 ? "(" + revokedCount + ")" : ""))
|
|
2030
|
+
)
|
|
2031
|
+
]);
|
|
2032
|
+
}
|
|
2033
|
+
function renderDevicesCard() {
|
|
2034
|
+
var count = devSessions === null ? null : devSessions.length;
|
|
2035
|
+
var btnLabel = devOpen
|
|
2036
|
+
? "收起已授权设备列表"
|
|
2037
|
+
: "已授权设备 " + (count === null ? "…" : count) + "(点击展开管理)";
|
|
2038
|
+
return card("📲 已授权设备", [
|
|
2039
|
+
h("div", { className: "dru-actions", style: { marginTop: 2 } },
|
|
2040
|
+
h("button", {
|
|
2041
|
+
type: "button",
|
|
2042
|
+
className: "dru-btn dru-btn-ghost",
|
|
2043
|
+
style: { width: "100%" },
|
|
2044
|
+
disabled: devBusy !== "",
|
|
2045
|
+
onClick: toggleDevices
|
|
2046
|
+
}, devBusy === "list" ? "加载中…" : btnLabel)
|
|
2047
|
+
),
|
|
2048
|
+
devOpen ? renderDeviceList() : null,
|
|
2049
|
+
devMsg
|
|
2050
|
+
? h("div", { className: "dru-msg dru-msg-" + devMsg.kind, style: { marginTop: 6 } },
|
|
2051
|
+
devMsg.text,
|
|
2052
|
+
devMsg.retry
|
|
2053
|
+
? h("button", { type: "button", className: "dru-linkbtn", style: { marginLeft: 8 }, disabled: devBusy !== "", onClick: devMsg.retry }, devBusy === "list" ? "重试中…" : "立即重试")
|
|
2054
|
+
: null)
|
|
2055
|
+
: null
|
|
2056
|
+
]);
|
|
2057
|
+
}
|
|
2058
|
+
|
|
1090
2059
|
// ---------- 主视图 ----------
|
|
1091
2060
|
function renderHome() {
|
|
1092
2061
|
var isLocal = mode === "local";
|
|
@@ -1096,16 +2065,11 @@ window.__ModuleLoader__.load({
|
|
|
1096
2065
|
h("div", { className: "dru-tab" + (!isLocal ? " active" : ""), onClick: function () { setMode("saas"); setMessage(null); } }, "☁️ 云端服务"),
|
|
1097
2066
|
h("div", { className: "dru-tab" + (isLocal ? " active" : ""), onClick: function () { setMode("local"); setMessage(null); } }, "🖥 自建服务")
|
|
1098
2067
|
),
|
|
1099
|
-
// 云端 tab
|
|
2068
|
+
// 云端 tab:📱 远程访问(一次性扫码访问 + 已授权设备)+ 账号(手机号登录,官方托管)
|
|
1100
2069
|
!isLocal ? h("div", null,
|
|
1101
|
-
|
|
1102
|
-
|
|
1103
|
-
|
|
1104
|
-
h("button", { type: "button", onClick: copyUrl }, copied ? "已复制" : "复制")
|
|
1105
|
-
),
|
|
1106
|
-
h("div", { className: "dru-hint", style: { marginTop: 6 } },
|
|
1107
|
-
st && st.relayReachable === false ? "⚠ 云端服务不可达(地址可能不是最新)" : "手机浏览器打开此地址登录后即可远程控制本机。")
|
|
1108
|
-
),
|
|
2070
|
+
renderAccessCard(),
|
|
2071
|
+
// 已授权设备:仅登录后展示(登录前不显示,避免空列表/误导)
|
|
2072
|
+
loggedIn && st.config.phone ? renderDevicesCard() : null,
|
|
1109
2073
|
card("🔑 账号",
|
|
1110
2074
|
st === null
|
|
1111
2075
|
? h("div", { className: "dru-hint" }, "正在读取远控状态…")
|
|
@@ -1113,19 +2077,26 @@ window.__ModuleLoader__.load({
|
|
|
1113
2077
|
? renderAccount()
|
|
1114
2078
|
: h("div", null,
|
|
1115
2079
|
h("div", { className: "dru-tabs" },
|
|
1116
|
-
h("div", { className: "dru-tab" + (authTab === "login" ? " active" : ""), onClick: function () { setAuthTab("login"); setMessage(null); } }, "登录"),
|
|
1117
|
-
h("div", { className: "dru-tab" + (authTab === "register" ? " active" : ""), onClick: function () { setAuthTab("register"); setMessage(null); } }, "注册")
|
|
2080
|
+
h("div", { className: "dru-tab" + (authTab === "login" ? " active" : ""), onClick: function () { setAuthTab("login"); setPwdOpen(false); setMessage(null); } }, "登录"),
|
|
2081
|
+
h("div", { className: "dru-tab" + (authTab === "register" ? " active" : ""), onClick: function () { setAuthTab("register"); setPwdOpen(false); setMessage(null); } }, "注册")
|
|
1118
2082
|
),
|
|
1119
2083
|
authTab === "login"
|
|
1120
|
-
?
|
|
1121
|
-
|
|
1122
|
-
|
|
1123
|
-
|
|
1124
|
-
|
|
1125
|
-
|
|
1126
|
-
|
|
1127
|
-
|
|
1128
|
-
|
|
2084
|
+
? (pwdOpen
|
|
2085
|
+
// 「忘记密码」展开:与账号卡「修改密码」共用同一重置表单(手机号可编辑、预填登录输入)
|
|
2086
|
+
? renderResetPwdForm(true)
|
|
2087
|
+
: h("div", null,
|
|
2088
|
+
field("手机号", input({ type: "tel", value: phone, placeholder: "11 位手机号", autoComplete: "tel", onChange: function (e) { setPhone(e.target.value); } })),
|
|
2089
|
+
field("密码", input({ type: "password", value: pass, placeholder: "密码", autoComplete: "current-password", onChange: function (e) { setPass(e.target.value); } })),
|
|
2090
|
+
field("验证码", h("div", { className: "dru-captcha" },
|
|
2091
|
+
input({ value: lcapTxt, placeholder: "图中数字", autoComplete: "off", inputMode: "numeric", maxLength: 6, onChange: function (e) { setLcapTxt(e.target.value); } }),
|
|
2092
|
+
h("div", { className: "dru-captcha-box", title: "看不清?点击刷新", onClick: function () { loadCaptcha("login"); }, dangerouslySetInnerHTML: lcap && lcap.svg && lcap.svg.indexOf("<svg") === 0 ? { __html: lcap.svg } : void 0 },
|
|
2093
|
+
lcap && lcap.svg && lcap.svg.indexOf("<svg") !== 0 ? lcap.svg : null)
|
|
2094
|
+
)),
|
|
2095
|
+
h("button", { type: "button", className: "dru-btn dru-btn-primary", style: { width: "100%" }, disabled: busy !== "", onClick: doLogin }, busy === "login" ? "登录中…" : "登录"),
|
|
2096
|
+
// 忘记密码:小字入口,点击展开短信验证码重置表单(不抢占任何官方按钮)
|
|
2097
|
+
h("div", { style: { display: "flex", justifyContent: "flex-end", marginTop: 8 } },
|
|
2098
|
+
h("button", { type: "button", className: "dru-linkbtn", disabled: busy !== "", onClick: togglePwdForm }, "忘记密码?"))
|
|
2099
|
+
)
|
|
1129
2100
|
)
|
|
1130
2101
|
: h("div", null,
|
|
1131
2102
|
field("手机号", input({ type: "tel", value: rphone, placeholder: "11 位手机号", autoComplete: "tel", onChange: function (e) { setRphone(e.target.value); } })),
|
|
@@ -1188,12 +2159,22 @@ window.__ModuleLoader__.load({
|
|
|
1188
2159
|
)
|
|
1189
2160
|
: null
|
|
1190
2161
|
),
|
|
1191
|
-
// 关于 dsh-remote
|
|
2162
|
+
// 关于 dsh-remote(v0.5+ 远程访问价值说明卡片)
|
|
1192
2163
|
card("📖 关于 dsh-remote", [
|
|
1193
|
-
h("div", { className: "dru-hint", style: { marginBottom: 6 } }, "
|
|
1194
|
-
h("div", { className: "dru-hint", style: { marginBottom: 6 } }, "
|
|
1195
|
-
h("div", { className: "dru-hint", style: { marginBottom: 6 } }, "
|
|
1196
|
-
h("div", { className: "dru-hint" }, "
|
|
2164
|
+
h("div", { className: "dru-hint", style: { marginBottom: 6 } }, "📱 远程访问:用手机或另一台电脑的浏览器,随时随地使用同一份 dsh web——人在哪都能用(免公网 IP、免内网穿透);官方托管中继,4G/5G 即用,也可自建服务。"),
|
|
2165
|
+
h("div", { className: "dru-hint", style: { marginBottom: 6 } }, "🛠 电脑端一键安装:bridge 与「远程访问」面板一次到位——云端/自建切换、账号登录、bridge 启停、一次性扫码访问、已授权设备管理、意见反馈都在这里。"),
|
|
2166
|
+
h("div", { className: "dru-hint", style: { marginBottom: 6 } }, "🔒 安全与通道:HTTP / WebSocket 全量透传,一次性访问密钥认证,面板实时显示设备与已授权设备列表;服务端可配置流量配额。"),
|
|
2167
|
+
h("div", { className: "dru-hint" }, "🛡 端到端加密:手机↔电脑之间的消息内容用「你的账号密码派生密钥」端到端加密——密钥与密码不落服务端(仅存校验值),中继只可见路径/大小/时间(详见 README「安全与隐私」)。"),
|
|
2168
|
+
// 加入交流群(后台上传二维码后出现;点击弹出二维码大图便于扫码)
|
|
2169
|
+
community && community.qrcode
|
|
2170
|
+
? h("div", { className: "dru-actions", style: { marginTop: 10 } },
|
|
2171
|
+
h("button", {
|
|
2172
|
+
type: "button",
|
|
2173
|
+
className: "dru-btn dru-btn-ghost",
|
|
2174
|
+
style: { width: "100%" },
|
|
2175
|
+
onClick: function () { setCommOpen(true); }
|
|
2176
|
+
}, "💬 加入交流群"))
|
|
2177
|
+
: null
|
|
1197
2178
|
]),
|
|
1198
2179
|
// 版本与更新(自管理:检测新版 / 一键在线更新 / 彻底卸载)
|
|
1199
2180
|
h(SelfManageCard, null),
|
|
@@ -1201,17 +2182,41 @@ window.__ModuleLoader__.load({
|
|
|
1201
2182
|
);
|
|
1202
2183
|
}
|
|
1203
2184
|
|
|
1204
|
-
|
|
2185
|
+
/** 交流群弹窗(复用满意度弹窗的 dru-popup 视觉;点遮罩/关闭即收起)。 */
|
|
2186
|
+
function renderCommunityModal() {
|
|
2187
|
+
if (!commOpen || !(community && community.qrcode)) return null;
|
|
2188
|
+
var close = function () { setCommOpen(false); };
|
|
2189
|
+
return h("div", { className: "dru-popup", onMouseDown: function (e) { if (e.target === e.currentTarget) close(); } },
|
|
2190
|
+
h("div", { className: "dru-popup-card", role: "dialog", "aria-label": "加入企微交流群" },
|
|
2191
|
+
h("div", { className: "dru-popup-body" },
|
|
2192
|
+
h("div", { className: "dru-popup-icon" }, "💬"),
|
|
2193
|
+
h("div", { className: "dru-popup-title" }, "加入企微交流群"),
|
|
2194
|
+
h("div", { className: "dru-popup-sub" }, "扫码入群:安装答疑 / 使用技巧 / 版本更新 / 问题反馈"),
|
|
2195
|
+
h("img", { className: "dru-community-qr", src: community.qrcode, alt: "企微交流群二维码" }),
|
|
2196
|
+
community.wechat
|
|
2197
|
+
? h("div", { className: "dru-hint", style: { marginTop: 10 } }, "二维码失效或群满,可加客服微信:" + community.wechat)
|
|
2198
|
+
: h("div", { className: "dru-hint", style: { marginTop: 10 } }, "二维码失效或群满,可到 GitHub 提 Issue 联系作者")
|
|
2199
|
+
),
|
|
2200
|
+
h("div", { className: "dru-popup-foot" },
|
|
2201
|
+
h("span", null, "手机微信/企业微信扫码即可入群"),
|
|
2202
|
+
h("button", { type: "button", onClick: close }, "关闭")
|
|
2203
|
+
)
|
|
2204
|
+
)
|
|
2205
|
+
);
|
|
2206
|
+
}
|
|
2207
|
+
|
|
2208
|
+
return h("div", { className: "dru-settings-section", role: "region", "aria-label": "远程访问" },
|
|
1205
2209
|
h("div", { className: "dru-settings-head" },
|
|
1206
|
-
h("span", { className: "dru-settings-icon" }, "
|
|
2210
|
+
h("span", { className: "dru-settings-icon" }, "📱"),
|
|
1207
2211
|
h("div", null,
|
|
1208
|
-
h("h2", { className: "dru-settings-title" }, "
|
|
1209
|
-
h("div", { className: "dru-settings-sub" }, "
|
|
2212
|
+
h("h2", { className: "dru-settings-title" }, "远程访问"),
|
|
2213
|
+
h("div", { className: "dru-settings-sub" }, "通过手机或另一台电脑远程使用同一份 dsh web,人在哪都能用(免公网 IP)")
|
|
1210
2214
|
)
|
|
1211
2215
|
),
|
|
1212
2216
|
h("div", { className: "dru-settings-body" },
|
|
1213
2217
|
view === "feedback" ? renderFeedback() : view === "invite" ? renderInvite() : renderHome()
|
|
1214
|
-
)
|
|
2218
|
+
),
|
|
2219
|
+
renderCommunityModal()
|
|
1215
2220
|
);
|
|
1216
2221
|
}
|
|
1217
2222
|
|
|
@@ -1220,13 +2225,13 @@ window.__ModuleLoader__.load({
|
|
|
1220
2225
|
function apply(ctx) {
|
|
1221
2226
|
// 面板入口迁移:从侧边栏(sidebar.footer.action)移入「设置」页官方扩展点
|
|
1222
2227
|
// settings.section(列表槽,由 ui-settings-general 在 sidebar.settings 下声明)。
|
|
1223
|
-
// order 30 > Agent 预设(20),栏目落在「Agent 预设」下方;label
|
|
2228
|
+
// order 30 > Agent 预设(20),栏目落在「Agent 预设」下方;label 即栏目名(📱 远程访问)。
|
|
1224
2229
|
ctx.slots.inject("settings.section", function () {
|
|
1225
2230
|
return ctx.slots.register({
|
|
1226
2231
|
name: "settings.section",
|
|
1227
2232
|
id: "dsh-remote",
|
|
1228
2233
|
order: 30,
|
|
1229
|
-
label: function () { return "
|
|
2234
|
+
label: function () { return "📱 远程访问"; }
|
|
1230
2235
|
}, RemoteControlSection);
|
|
1231
2236
|
});
|
|
1232
2237
|
ctx.slots.inject("shell.overlay", function () {
|
|
@@ -1235,10 +2240,18 @@ window.__ModuleLoader__.load({
|
|
|
1235
2240
|
|
|
1236
2241
|
// 首次安装引导小红点(localStorage dsh-remote-seen-dot;点击后不再显示)
|
|
1237
2242
|
dotWatch();
|
|
2243
|
+
// 侧栏「远程访问」快捷入口(2026-09 恢复注入:与官方「设置」按钮共存不遮挡)
|
|
2244
|
+
navEnsureStart();
|
|
1238
2245
|
|
|
1239
2246
|
// 满意度弹窗调度:首次观察到 bridge 运行(即“安装完成并体验”)后约 10 分钟弹出;
|
|
1240
2247
|
// 每 60 秒复查一次,避免 dsh web 启动晚于到点时间。
|
|
2248
|
+
// 弹窗状态按「账号/设备」分作用域(见 fbPopScope);旧版无后缀键视为已完成并迁移,不再打扰老用户。
|
|
2249
|
+
var legacyPopState = null;
|
|
2250
|
+
try { legacyPopState = JSON.parse(localStorage.getItem(FB_POPUP_KEY) || "null"); } catch (e) { legacyPopState = null; }
|
|
2251
|
+
try { localStorage.removeItem(FB_POPUP_KEY); } catch (e) {}
|
|
1241
2252
|
api("/dsh-remote/status").then(function (body) {
|
|
2253
|
+
if (body && body.config) setFbPopScope(body.config.phone || body.config.deviceId || "anon");
|
|
2254
|
+
if (legacyPopState && legacyPopState.state === "done") fbSavePopState({ state: "done", firstSeen: legacyPopState.firstSeen || Date.now(), nextAt: 0 });
|
|
1242
2255
|
if (body && body.service && body.service.running) {
|
|
1243
2256
|
fbEnsureFirstSeen();
|
|
1244
2257
|
fbMaybeOpenPopup();
|
|
@@ -1249,6 +2262,7 @@ window.__ModuleLoader__.load({
|
|
|
1249
2262
|
if (!s || s.state !== "pending") { clearInterval(popupTimer); return; }
|
|
1250
2263
|
if (!fbFirstSeenAt) {
|
|
1251
2264
|
api("/dsh-remote/status").then(function (body) {
|
|
2265
|
+
if (body && body.config) setFbPopScope(body.config.phone || body.config.deviceId || "anon");
|
|
1252
2266
|
if (body && body.service && body.service.running) {
|
|
1253
2267
|
fbEnsureFirstSeen();
|
|
1254
2268
|
fbMaybeOpenPopup();
|