@wendongfly/myhi 1.3.190 → 1.3.192

package/dist/lib/machine.js

@@ -11,8 +11,11 @@
 
   function fmt(t) {
     if (sessionPage) {
-      const rest = t.replace(/\s*—\s*myhi$/, '').trim();
-      return rest && rest !== 'myhi' ? rest : (name || 'myhi');   // 会话还没加载出标题时先显示机器名
+      // 会话页设的标题是「任务名 — myhi」，只留任务名（任务名本身叫 myhi 也照样显示 myhi）；
+      // 还没加载出任务时是页面自带的「myhi 会话」，先显示机器名
+      const m = t.match(/^(.*?)\s*—\s*myhi$/);
+      if (m && m[1].trim()) return m[1].trim();
+      return /^myhi (会话|终端)$/.test(t) ? (name || 'myhi') : t;   // 只认页面自带的占位标题，改写后的结果再进来保持不动
     }
     if (!name || t.startsWith(name + ' · ')) return t;
     const rest = t.replace(/\s*—\s*myhi$/, '').replace(/^myhi\s*/, '').trim();

package/dist/lib/prefs.js

@@ -0,0 +1,51 @@
+// 个人偏好跨设备同步：外观（主题/字号）、会话页的聊天显示与快捷栏。
+// 各页面照旧读写 localStorage（myhi_theme / myhi_font / myhi_chat_settings），本脚本负责和服务端 /api/prefs 对齐：
+//   · 打开页面：服务端那份比本机新 → 写回 localStorage，有差异就刷新一次让页面按新设置渲染（每个标签页最多一次）；
+//     本机比服务端新（或服务端还没有）→ 推上去。
+//   · 页面改了设置后调 myhiPrefsPush()（防抖 800ms）推上去。
+(function () {
+  const LS = { theme: 'myhi_theme', font: 'myhi_font', chat: 'myhi_chat_settings' };
+  const AT = 'myhi_prefs_at';   // 本机这份偏好对应的服务端时间戳
+  const get = (k) => { try { return localStorage.getItem(k); } catch { return null; } };
+  const set = (k, v) => { try { v == null ? localStorage.removeItem(k) : localStorage.setItem(k, v); } catch {} };
+  const dirty = () => get(AT + '_dirty') === '1';
+
+  function snapshot() {
+    let chat = null;
+    try { chat = JSON.parse(get(LS.chat) || 'null'); } catch {}
+    return { theme: get(LS.theme), font: get(LS.font), chat };
+  }
+
+  let timer = null;
+  window.myhiPrefsPush = function () {
+    set(AT + '_dirty', '1');   // 先记「本机有未推送的改动」，推失败/页面关了下次打开再推
+    clearTimeout(timer);
+    timer = setTimeout(async () => {
+      try {
+        const r = await fetch('/api/prefs', { method: 'PUT', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(snapshot()) });
+        const d = await r.json();
+        if (d.ok) { set(AT, String(d.updatedAt)); set(AT + '_dirty', null); }
+      } catch {}
+    }, 800);
+  };
+
+  fetch('/api/prefs').then((r) => (r.ok ? r.json() : null)).then((d) => {
+    if (!d?.ok) return;
+    const p = d.prefs;
+    const localAt = Number(get(AT) || 0);
+    if (!p || dirty() || (p.updatedAt || 0) <= localAt) {
+      // 服务端没有 / 本机有没推的改动 / 本机已是最新：本机为准（有值才推，空白新设备不推空值覆盖）
+      if ((!p || dirty()) && (get(LS.theme) || get(LS.font) || get(LS.chat))) window.myhiPrefsPush();
+      return;
+    }
+    const before = JSON.stringify(snapshot());
+    if (p.theme !== undefined) set(LS.theme, p.theme);
+    if (p.font !== undefined) set(LS.font, p.font);
+    if (p.chat !== undefined) set(LS.chat, p.chat == null ? null : JSON.stringify(p.chat));
+    set(AT, String(p.updatedAt));
+    if (JSON.stringify(snapshot()) !== before) {
+      try { if (sessionStorage.getItem('myhi_prefs_reloaded')) return; sessionStorage.setItem('myhi_prefs_reloaded', '1'); } catch {}
+      location.reload();
+    }
+  }).catch(() => {});
+})();

package/dist/login.html

@@ -1,163 +1,175 @@
-<!DOCTYPE html>
-<html lang="zh-CN">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, viewport-fit=cover">
-  <meta name="theme-color" content="#0d1117">
-  <meta name="apple-mobile-web-app-capable" content="yes">
-  <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
-  <link rel="apple-touch-icon" href="/icon.png">
-  <link rel="manifest" href="/manifest.json">
-  <title>myhi</title>
-  <style>
-    * { box-sizing: border-box; margin: 0; padding: 0; }
-    html, body {
-      height: 100%;
-      background: #0d1117;
-      color: #e6edf3;
-      font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
-    }
-    body {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      padding: env(safe-area-inset-top) env(safe-area-inset-right)
-               env(safe-area-inset-bottom) env(safe-area-inset-left);
-    }
-
-    .card {
-      width: 100%;
-      max-width: 340px;
-      padding: 2.5rem 2rem;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      gap: 1.5rem;
-    }
-
-    .logo {
-      font-size: 2.2rem;
-      font-weight: 800;
-      letter-spacing: -1px;
-    }
-    .logo span { color: #7c3aed; }
-
-    form {
-      width: 100%;
-      display: flex;
-      flex-direction: column;
-      gap: 0.85rem;
-    }
-
-    input[type=password] {
-      width: 100%;
-      background: #161b22;
-      border: 1.5px solid #21262d;
-      border-radius: 10px;
-      padding: 0.85rem 1rem;
-      color: #e6edf3;
-      font-size: 1.1rem;
-      text-align: center;
-      letter-spacing: 0.2em;
-      outline: none;
-      transition: border-color 0.15s;
-      -webkit-appearance: none;
-    }
-    input[type=password]:focus { border-color: #7c3aed; }
-    input[type=password]::placeholder { letter-spacing: normal; font-size: 0.9rem; color: #4a5568; }
-
-    button {
-      width: 100%;
-      background: #7c3aed;
-      color: #fff;
-      border: none;
-      border-radius: 10px;
-      padding: 0.85rem;
-      font-size: 1rem;
-      font-weight: 600;
-      cursor: pointer;
-      transition: background 0.15s;
-      -webkit-appearance: none;
-    }
-    button:active { background: #6d28d9; }
-    button:disabled { background: #4a5568; cursor: not-allowed; }
-
-    .error {
-      font-size: 0.82rem;
-      color: #f85149;
-      text-align: center;
-      min-height: 1.2em;
-    }
-
-    .occupied {
-      font-size: 0.9rem;
-      color: #f0883e;
-      text-align: center;
-      line-height: 1.6;
-      padding: 0.8rem;
-      background: rgba(240, 136, 62, 0.1);
-      border-radius: 10px;
-      display: none;
-    }
-
-    .hint {
-      font-size: 0.75rem;
-      color: #4a5568;
-      text-align: center;
-      line-height: 1.5;
-    }
-  </style>
-</head>
-<body>
-  <div class="card">
-    <div class="logo">my<span>hi</span></div>
-
-    <div class="occupied" id="occupied"></div>
-
-    <form method="POST" action="/login">
-      <input type="password" name="password" placeholder="输入密码" autofocus autocomplete="current-password">
-      <div class="error" id="err"></div>
-      <button type="submit" id="btn">进入</button>
-    </form>
-
-    <div class="hint">密码见服务器启动日志<br>或编辑 ~/.myhi/password</div>
-  </div>
-
-  <script>
-    const errType = new URLSearchParams(location.search).get('error');
-    const errUser = new URLSearchParams(location.search).get('user');
-    if (errType === 'locked') {
-      document.getElementById('err').textContent = '登录尝试过多，请 5 分钟后重试';
-    } else if (errType === 'occupied' && errUser) {
-      document.getElementById('err').textContent = errUser + ' 正在使用中，同账号可直接登录，不同账号请让对方退出';
-    } else if (errType) {
-      document.getElementById('err').textContent = '密码错误，请重试';
-    }
-    document.querySelector('input').focus();
-
-    // 轮询登录状态（独占模式）
-    const occupiedEl = document.getElementById('occupied');
-    const btnEl = document.getElementById('btn');
-    const inputEl = document.querySelector('input[type=password]');
-
-    async function checkStatus() {
-      try {
-        const res = await fetch('/api/status');
-        const data = await res.json();
-        if (data.occupied) {
-          occupiedEl.textContent = data.userName + ' 正在使用中' + (data.releasing ? '\n对方已离线，即将自动释放…' : '\n同账号可直接登录');
-          occupiedEl.style.display = 'block';
-        } else if (data.onlineUsers && data.onlineUsers.length > 0) {
-          occupiedEl.textContent = '当前在线: ' + data.onlineUsers.join(', ');
-          occupiedEl.style.display = 'block';
-        } else {
-          occupiedEl.style.display = 'none';
-        }
-      } catch {}
-    }
-
-    checkStatus();
-    setInterval(checkStatus, 3000);
-  </script>
-</body>
-</html>
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, viewport-fit=cover">
+  <meta name="theme-color" content="#0d1117">
+  <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
+  <link rel="apple-touch-icon" href="/icon.png">
+  <link rel="manifest" href="/manifest.json">
+  <title>myhi</title>
+  <script src="/theme.js"></script>
+  <script>
+    // 主题：浏览器选过的优先，否则用服务端默认（新装浅色、老机器深色），与其他页面一致
+    (function(){try{var t=localStorage.getItem('myhi_theme')||window.MYHI_DEFAULT_THEME||'dark';
+      if(t==='system') t=matchMedia('(prefers-color-scheme: light)').matches?'light':'dark';
+      if(t!=='dark') document.documentElement.setAttribute('data-theme',t);
+      var m=document.querySelector('meta[name="theme-color"]'); if(m) m.setAttribute('content',t==='light'?'#ffffff':t==='black'?'#000000':'#0d1117');
+    }catch(e){}})();
+  </script>
+  <style>
+    :root { --bg:#0d1117; --surface:#161b22; --border:#21262d; --text:#e6edf3; --muted:#4a5568; --accent:#7c3aed; --accent2:#6d28d9; }
+    :root[data-theme="light"] { --bg:#ffffff; --surface:#f6f8fa; --border:#d0d7de; --text:#1f2328; --muted:#8c959f; --accent:#8250df; --accent2:#6f42c1; }
+    :root[data-theme="black"] { --bg:#000000; --surface:#0a0a0a; --border:#262626; }
+    * { box-sizing: border-box; margin: 0; padding: 0; }
+    html, body {
+      height: 100%;
+      background: var(--bg);
+      color: var(--text);
+      font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+    }
+    body {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      padding: env(safe-area-inset-top) env(safe-area-inset-right)
+               env(safe-area-inset-bottom) env(safe-area-inset-left);
+    }
+
+    .card {
+      width: 100%;
+      max-width: 340px;
+      padding: 2.5rem 2rem;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      gap: 1.5rem;
+    }
+
+    .logo {
+      font-size: 2.2rem;
+      font-weight: 800;
+      letter-spacing: -1px;
+    }
+    .logo span { color: var(--accent); }
+
+    form {
+      width: 100%;
+      display: flex;
+      flex-direction: column;
+      gap: 0.85rem;
+    }
+
+    input[type=password] {
+      width: 100%;
+      background: var(--surface);
+      border: 1.5px solid var(--border);
+      border-radius: 10px;
+      padding: 0.85rem 1rem;
+      color: var(--text);
+      font-size: 1.1rem;
+      text-align: center;
+      letter-spacing: 0.2em;
+      outline: none;
+      transition: border-color 0.15s;
+      -webkit-appearance: none;
+    }
+    input[type=password]:focus { border-color: var(--accent); }
+    input[type=password]::placeholder { letter-spacing: normal; font-size: 0.9rem; color: var(--muted); }
+
+    button {
+      width: 100%;
+      background: var(--accent);
+      color: #fff;
+      border: none;
+      border-radius: 10px;
+      padding: 0.85rem;
+      font-size: 1rem;
+      font-weight: 600;
+      cursor: pointer;
+      transition: background 0.15s;
+      -webkit-appearance: none;
+    }
+    button:active { background: var(--accent2); }
+    button:disabled { background: #4a5568; cursor: not-allowed; }
+
+    .error {
+      font-size: 0.82rem;
+      color: #f85149;
+      text-align: center;
+      min-height: 1.2em;
+    }
+
+    .occupied {
+      font-size: 0.9rem;
+      color: #f0883e;
+      text-align: center;
+      line-height: 1.6;
+      padding: 0.8rem;
+      background: rgba(240, 136, 62, 0.1);
+      border-radius: 10px;
+      display: none;
+    }
+
+    .hint {
+      font-size: 0.75rem;
+      color: var(--muted);
+      text-align: center;
+      line-height: 1.5;
+    }
+  </style>
+</head>
+<body>
+  <div class="card">
+    <div class="logo">my<span>hi</span></div>
+
+    <div class="occupied" id="occupied"></div>
+
+    <form method="POST" action="/login">
+      <input type="password" name="password" placeholder="输入密码" autofocus autocomplete="current-password">
+      <div class="error" id="err"></div>
+      <button type="submit" id="btn">进入</button>
+    </form>
+
+    <div class="hint">密码见服务器启动日志<br>或编辑 ~/.myhi/password</div>
+  </div>
+
+  <script>
+    const errType = new URLSearchParams(location.search).get('error');
+    const errUser = new URLSearchParams(location.search).get('user');
+    if (errType === 'locked') {
+      document.getElementById('err').textContent = '登录尝试过多，请 5 分钟后重试';
+    } else if (errType === 'occupied' && errUser) {
+      document.getElementById('err').textContent = errUser + ' 正在使用中，同账号可直接登录，不同账号请让对方退出';
+    } else if (errType) {
+      document.getElementById('err').textContent = '密码错误，请重试';
+    }
+    document.querySelector('input').focus();
+
+    // 轮询登录状态（独占模式）
+    const occupiedEl = document.getElementById('occupied');
+    const btnEl = document.getElementById('btn');
+    const inputEl = document.querySelector('input[type=password]');
+
+    async function checkStatus() {
+      try {
+        const res = await fetch('/api/status');
+        const data = await res.json();
+        if (data.occupied) {
+          occupiedEl.textContent = data.userName + ' 正在使用中' + (data.releasing ? '\n对方已离线，即将自动释放…' : '\n同账号可直接登录');
+          occupiedEl.style.display = 'block';
+        } else if (data.onlineUsers && data.onlineUsers.length > 0) {
+          occupiedEl.textContent = '当前在线: ' + data.onlineUsers.join(', ');
+          occupiedEl.style.display = 'block';
+        } else {
+          occupiedEl.style.display = 'none';
+        }
+      } catch {}
+    }
+
+    checkStatus();
+    setInterval(checkStatus, 3000);
+  </script>
+</body>
+</html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wendongfly/myhi",
-  "version": "1.3.190",
+  "version": "1.3.192",
   "description": "Web-based terminal sharing with chat UI — control your terminal from phone via LAN/Tailscale",
   "type": "module",
   "main": "dist/index.js",