@wendongfly/myhi 1.3.188 → 1.3.191

package/dist/admin.html

@@ -41,6 +41,20 @@
   .inp-row { display: flex; gap: 0.5rem; align-items: center; margin-bottom: 0.5rem; }
   .inp-row .inp { flex: 1; }
   .btn-sm { padding: 0.5rem 1rem; background: #7c3aed; color: #fff; border: none; border-radius: 8px; cursor: pointer; font-size: 0.85rem; white-space: nowrap; }
+  .btn-sm.ghost { background: transparent; color: #b1bac4; border: 1px solid rgba(255,255,255,0.15); }
+  .mode-status { font-size: 0.85rem; line-height: 1.6; padding: 0.6rem 0.75rem; border-radius: 10px; background: rgba(124,58,237,0.1); border: 1px solid rgba(124,58,237,0.25); margin-bottom: 0.5rem; }
+  .mode-status b { color: #e6edf3; }
+  .mode-status small { display: block; color: #8b949e; font-size: 0.75rem; }
+  .sw { position: relative; width: 38px; height: 22px; flex-shrink: 0; }
+  .sw input { opacity: 0; width: 0; height: 0; }
+  .sw span { position: absolute; inset: 0; background: #30363d; border-radius: 11px; cursor: pointer; transition: 0.2s; }
+  .sw span::before { content: ''; position: absolute; width: 16px; height: 16px; left: 3px; top: 3px; background: #fff; border-radius: 50%; transition: 0.2s; }
+  .sw input:checked + span { background: #7c3aed; }
+  .sw input:checked + span::before { transform: translateX(16px); }
+  .dir-pick { border: 1px solid rgba(255,255,255,0.1); border-radius: 8px; max-height: 220px; overflow-y: auto; margin-bottom: 0.5rem; font-size: 0.8rem; }
+  .dir-pick div { padding: 0.4rem 0.6rem; cursor: pointer; color: #b1bac4; }
+  .dir-pick div:hover { background: rgba(255,255,255,0.05); }
+  .dir-pick .cur { color: #8b949e; font-size: 0.72rem; cursor: default; border-bottom: 1px solid rgba(255,255,255,0.06); }
   .msg { font-size: 0.8rem; margin-top: 0.3rem; min-height: 1.2em; }
   .msg-ok { color: #3fb950; }
   .msg-err { color: #f85149; }
@@ -101,21 +115,33 @@
   </div>
 
   <!-- 用户管理 -->
-  <div class="card">
-    <h3>用户管理</h3>
+  <div class="card" id="mode">
+    <h3>使用模式</h3>
+    <div id="mode-status" class="mode-status"></div>
     <div id="user-list"></div>
-    <div style="border-top:1px solid rgba(255,255,255,0.08);margin-top:0.5rem;padding-top:0.8rem">
-      <div style="font-size:0.82rem;color:#8b949e;margin-bottom:0.5rem">添加用户</div>
+    <div id="excl-row" class="row" style="display:none">
+      <span>独占模式<br><small style="color:#6e7681">同一时间只允许一个人登录，别人登录会被挡住</small></span>
+      <label class="sw"><input type="checkbox" id="excl-toggle" onchange="setExclusive(this.checked)"><span></span></label>
+    </div>
+    <button class="btn-sm" id="add-open" onclick="openAddMember()" style="margin-top:0.6rem;width:100%"></button>
+    <div id="add-member" style="display:none;margin-top:0.7rem">
+      <div class="inp-row"><input class="inp" id="u-name" placeholder="成员名称（如：张三）"></div>
       <div class="inp-row">
-        <input class="inp" id="u-pwd" placeholder="密码">
-        <input class="inp" id="u-name" placeholder="名称">
+        <input class="inp" id="u-pwd" placeholder="登录密码（至少 4 位）" autocomplete="off">
+        <button class="btn-sm ghost" onclick="genPwd()">随机生成</button>
       </div>
       <div class="inp-row">
-        <input class="inp" id="u-dir" placeholder="工作目录">
-        <button class="btn-sm" onclick="addUser()">添加</button>
+        <input class="inp" id="u-dir" placeholder="工作目录（留空 = 不限制）">
+        <button class="btn-sm ghost" onclick="pickDir()">浏览…</button>
+      </div>
+      <div id="dir-pick" style="display:none" class="dir-pick"></div>
+      <div class="inp-row" style="margin-top:0.2rem">
+        <button class="btn-sm ghost" onclick="closeAddMember()" style="flex:1">取消</button>
+        <button class="btn-sm" onclick="addUser()" style="flex:2">添加</button>
       </div>
-      <div class="msg" id="u-msg"></div>
     </div>
+    <div class="msg" id="u-msg"></div>
+    <div id="mode-foot" style="font-size:0.72rem;color:#6e7681;margin-top:0.5rem;line-height:1.5"></div>
   </div>
 
   <!-- 修改管理密码 -->
@@ -369,7 +395,7 @@ async function refresh() {
     }
 
     // 用户列表
-    renderUsers(d.users || []);
+    renderUsers(d.users || [], d.exclusive);
 
     // 运行时长
     if (d.uptime) {
@@ -379,20 +405,70 @@ async function refresh() {
   } catch {}
 }
 
-function renderUsers(users) {
+// 使用模式：有成员 = 多用户，没有 = 单用户（默认）
+let _users = [];
+function renderUsers(users, exclusive) {
+  _users = users;
+  const multi = users.length > 0;
+  document.getElementById('mode-status').innerHTML = multi
+    ? `<b>当前：多用户模式 · ${users.length} 个成员</b><small>成员用各自密码登录，可以升级 / 重启，不能改全局设置；你用管理密码或二维码登录，权限不变。</small>`
+    : `<b>当前：单用户模式</b><small>只有你在用，所有功能都能用。需要给别人用时再添加成员。</small>`;
+  document.getElementById('add-open').textContent = multi ? '＋ 添加成员' : '＋ 添加成员，开启多用户模式';
+  document.getElementById('excl-row').style.display = multi ? '' : 'none';
+  document.getElementById('excl-toggle').checked = !!exclusive;
+  document.getElementById('mode-foot').textContent = multi ? '删除全部成员即回到单用户模式。删除成员或重置密码后，他当前的登录会立即失效。' : '';
   const el = document.getElementById('user-list');
-  if (!users.length) { el.innerHTML = '<div class="row" style="color:#6e7681">暂无用户</div>'; return; }
   el.innerHTML = users.map(u => `
     <div class="row">
-      <span><b style="color:#e6edf3">${esc(u.name)}</b> <span style="color:#6e7681;font-size:0.75rem">${esc(u.password)}</span> <span style="color:#6e7681;font-size:0.72rem">${esc(u.dir)}</span></span>
+      <span><b style="color:#e6edf3">${esc(u.name)}</b> <span style="color:#6e7681;font-size:0.72rem">${u.dir ? '📁 ' + esc(u.dir) : '不限目录'}</span></span>
       <div class="row-actions">
-        <button onclick="editUserPwd('${esc(u.name)}')">改密</button>
+        <button onclick="editUserPwd('${esc(u.name)}')">重置密码</button>
         <button class="del" onclick="delUser('${esc(u.name)}')">删除</button>
       </div>
     </div>
   `).join('');
 }
 
+function openAddMember() {
+  document.getElementById('add-member').style.display = '';
+  document.getElementById('add-open').style.display = 'none';
+  document.getElementById('u-name').focus();
+}
+function closeAddMember() {
+  document.getElementById('add-member').style.display = 'none';
+  document.getElementById('add-open').style.display = '';
+  document.getElementById('dir-pick').style.display = 'none';
+}
+function genPwd() {
+  const cs = 'abcdefghjkmnpqrstuvwxyz23456789';
+  const a = crypto.getRandomValues(new Uint32Array(8));
+  document.getElementById('u-pwd').value = [...a].map(n => cs[n % cs.length]).join('');
+}
+// 目录点选：复用 /api/dirs（主站以管理员身份登录时可用；不行就手动输入）
+async function pickDir(path) {
+  const box = document.getElementById('dir-pick');
+  box.style.display = '';
+  try {
+    const r = await fetch('/api/dirs' + (path ? '?path=' + encodeURIComponent(path) : ''));
+    const d = await r.json();
+    if (!r.ok) throw new Error(d.error || r.status);
+    document.getElementById('u-dir').value = d.current;
+    box.innerHTML = `<div class="cur">${esc(d.current)}</div>` +
+      (d.parent ? `<div data-p="${esc(d.parent)}">⬆ 上一级</div>` : '') +
+      (d.drives || []).map(x => `<div data-p="${esc(x)}">💽 ${esc(x)}</div>`).join('') +
+      d.dirs.map(x => `<div data-p="${esc(x.path)}">📁 ${esc(x.name)}</div>`).join('');
+    box.querySelectorAll('[data-p]').forEach(el => el.onclick = () => pickDir(el.dataset.p));
+  } catch (e) { box.innerHTML = `<div class="cur">无法浏览目录（${esc(e.message)}），请直接输入路径</div>`; }
+}
+
+async function setExclusive(on) {
+  try {
+    const r = await fetch('/api/admin/exclusive', { method: 'POST', headers: H(), body: JSON.stringify({ on }) });
+    const d = await r.json();
+    if (!d.ok) { alert(d.error || '失败'); refresh(); }
+  } catch { alert('连接失败'); refresh(); }
+}
+
 function esc(s) { return String(s||'').replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').replace(/"/g,'&quot;').replace(/'/g,'&#39;'); }
 
 async function addUser() {
@@ -400,17 +476,27 @@ async function addUser() {
   const name = document.getElementById('u-name').value.trim();
   const dir = document.getElementById('u-dir').value.trim();
   const msg = document.getElementById('u-msg');
-  if (!pwd || !name || !dir) { msg.className = 'msg msg-err'; msg.textContent = '密码、名称、目录都必填'; return; }
+  if (!name || !pwd) { msg.className = 'msg msg-err'; msg.textContent = '成员名称和登录密码必填'; return; }
+  // 第一个成员 = 从单用户切到多用户：先讲清楚会发生什么
+  if (!_users.length && !confirm(
+    '添加第一个成员后，myhi 进入「多用户模式」：\n\n' +
+    '· 成员用各自的密码登录' + (dir ? '，只能在绑定的目录里建任务' : '') + '；\n' +
+    '· 成员可以升级、重启，但不能改全局设置（本机显示名、语音、用户、网关等）；\n' +
+    '· 你（管理员）照常用管理密码或二维码登录，权限不变。\n\n' +
+    '以后删除全部成员即回到单用户模式。确定添加？')) return;
   try {
     const r = await fetch('/api/admin/user', { method: 'POST', headers: H(), body: JSON.stringify({ password: pwd, name, dir }) });
     const d = await r.json();
-    if (d.ok) { msg.className = 'msg msg-ok'; msg.textContent = '已添加'; document.getElementById('u-pwd').value = ''; document.getElementById('u-name').value = ''; document.getElementById('u-dir').value = ''; refresh(); }
-    else { msg.className = 'msg msg-err'; msg.textContent = d.error || '失败'; }
+    if (d.ok) {
+      msg.className = 'msg msg-ok'; msg.textContent = `已添加「${name}」，登录密码：${pwd}（请告知对方）`;
+      ['u-pwd', 'u-name', 'u-dir'].forEach(id => document.getElementById(id).value = '');
+      closeAddMember(); refresh();
+    } else { msg.className = 'msg msg-err'; msg.textContent = d.error || '失败'; }
   } catch { msg.className = 'msg msg-err'; msg.textContent = '连接失败'; }
 }
 
 async function editUserPwd(name) {
-  const newPwd = prompt(`修改 ${name} 的密码：`);
+  const newPwd = prompt(`为 ${name} 设置新的登录密码（至少 4 位，设置后他当前的登录会失效）：`);
   if (!newPwd) return;
   try {
     const r = await fetch('/api/admin/user/password', { method: 'POST', headers: H(), body: JSON.stringify({ name, password: newPwd }) });
@@ -421,7 +507,7 @@ async function editUserPwd(name) {
 }
 
 async function delUser(name) {
-  if (!confirm(`确定删除用户 ${name}？`)) return;
+  if (!confirm(`确定删除成员「${name}」？他当前的登录会立即失效。` + (_users.length === 1 ? '\n\n这是最后一个成员，删除后回到单用户模式。' : ''))) return;
   try {
     const r = await fetch('/api/admin/user', { method: 'DELETE', headers: H(), body: JSON.stringify({ name }) });
     const d = await r.json();
@@ -442,15 +528,38 @@ async function changePwd() {
   } catch { msg.className = 'msg msg-err'; msg.textContent = '连接失败'; }
 }
 
-async function doUpgrade() {
+// 等升级落地：轮询 /api/version（重启/停服期间连不上是正常的）。
+// 成功 = 版本变了（且等于目标）；失败 = 服务端报了本次升级的失败原因；10 分钟兜底超时。
+async function waitUpgrade(from, target, onTick) {
+  const t0 = Date.now();
+  while (Date.now() - t0 < 10 * 60 * 1000) {
+    await new Promise(r => setTimeout(r, 3000));
+    let v = null;
+    try { const r = await fetch('/api/version', { cache: 'no-store' }); if (r.ok) v = await r.json(); } catch {}
+    onTick?.(!!v, Math.round((Date.now() - t0) / 1000));
+    if (!v) continue;
+    if (v.current !== from && (!target || v.current === target)) return { ok: true, version: v.current };
+    const last = v.upgrade?.last;
+    if (!v.upgrade?.running && last && !last.ok && last.at >= t0 - 5000) return { ok: false, error: last.error };
+  }
+  return { ok: false, error: '等了 10 分钟仍未完成，请稍后刷新页面查看版本，或到服务器上查看 myhi log' };
+}
+async function doUpgrade(force) {
   const btn = document.getElementById('btn-up'), msg = document.getElementById('op-msg');
-  btn.disabled = true; btn.textContent = '升级中...'; msg.textContent = '正在下载安装...'; msg.style.display = '';
+  const fail = (t) => { msg.textContent = '失败: ' + t; btn.disabled = false; btn.textContent = '重试'; };
+  btn.disabled = true; btn.textContent = '升级中...'; msg.textContent = '正在提交升级...'; msg.style.display = '';
   try {
-    const r = await fetch('/api/admin/upgrade', { method: 'POST', headers: H() });
-    const d = await r.json();
-    if (d.ok) { msg.textContent = '升级完成，重启中...'; waitReload(); }
-    else { msg.textContent = '失败: ' + (d.error||''); btn.disabled = false; btn.textContent = '重试'; }
-  } catch { msg.textContent = '连接失败'; btn.disabled = false; btn.textContent = '重试'; }
+    const r = await fetch('/api/admin/upgrade', { method: 'POST', headers: { ...H(), 'Content-Type': 'application/json' }, body: JSON.stringify({ force: !!force }) });
+    const d = await r.json().catch(() => ({}));
+    if (!d.ok) {
+      if (d.busy?.length && confirm(d.error + '\n\n仍然现在升级吗？')) return doUpgrade(true);
+      return fail(d.error || ('HTTP ' + r.status));
+    }
+    msg.textContent = d.message || '升级中...';
+    const res = await waitUpgrade(d.from, d.target, (up, sec) => { msg.textContent = (up ? '正在安装新版本… ' : '服务重启中… ') + sec + 's'; });
+    if (res.ok) { msg.textContent = '已升级到 v' + res.version + '，即将刷新'; setTimeout(() => location.reload(), 800); }
+    else fail(res.error);
+  } catch { fail('连接失败'); }
 }
 
 async function doClaudeUpgrade() {
@@ -492,7 +601,15 @@ async function waitReload() {
   document.getElementById('op-msg').textContent = '重启超时，请手动刷新';
 }
 
-if (T) showAdmin();
+// 主站已是管理员 → 直接换后台令牌免登录；否则沿用本标签页已有令牌（重启后会失效）或显示登录框
+(async () => {
+  try {
+    const r = await fetch('/api/admin/sso', { method: 'POST' });
+    const d = r.ok ? await r.json() : null;
+    if (d?.ok) { T = d.token; sessionStorage.setItem('myhi_admin', T); return showAdmin(); }
+  } catch {}
+  if (T) showAdmin();
+})();
 </script>
 </body>
 </html>