termdock 1.4.68 → 1.4.70

package/.desktop-dist/main.js

@@ -1,4 +1,4 @@
-import { app, BrowserWindow, dialog, ipcMain, Menu, net, Notification, shell, } from 'electron';
+import { app, BrowserWindow, dialog, ipcMain, Menu, net, Notification, session, shell, } from 'electron';
 import { execFile, spawn } from 'node:child_process';
 import crypto from 'node:crypto';
 import fs from 'node:fs';
@@ -19,6 +19,7 @@ const DEFAULT_LOCAL_URL = 'http://localhost:9834';
 const PROTOCOL_VERSION = 1;
 const HEALTH_TIMEOUT_MS = 3_500;
 const START_TIMEOUT_MS = 90_000;
+const localServiceCertificatePath = path.join(termdockDir, 'certs', 'termdock-local.pem');
 /** Delivered-but-unseen desktop notifications, mirrored into the Dock badge. */
 const activeNotifications = new Map();
 let unreadNotificationCount = 0;
@@ -27,11 +28,29 @@ function clearUnreadNotifications() {
     app.setBadgeCount(0);
 }
 let mainWindow = null;
-let activeServiceOrigin = null;
+const serviceWindows = new Map();
+const windowServiceOrigins = new WeakMap();
 let isQuitting = false;
+function focusedWorkspaceWindow() {
+    const focused = BrowserWindow.getFocusedWindow();
+    if (focused && windowServiceOrigins.has(focused))
+        return focused;
+    return [...serviceWindows.values()].find((window) => !window.isDestroyed()) ?? null;
+}
+function serviceLabel(url) {
+    const normalized = normalizeServiceUrl(url);
+    const saved = readDesktopConfig().connections.find((entry) => entry.url === normalized);
+    if (saved?.label.trim())
+        return saved.label.trim();
+    const parsed = new URL(normalized);
+    return parsed.hostname === 'localhost' || parsed.hostname === '127.0.0.1'
+        ? '本机'
+        : parsed.host;
+}
 function showDesktopMessageBox(options) {
-    return mainWindow
-        ? dialog.showMessageBox(mainWindow, options)
+    const parent = BrowserWindow.getFocusedWindow() ?? mainWindow;
+    return parent
+        ? dialog.showMessageBox(parent, options)
         : dialog.showMessageBox(options);
 }
 function openExternalLink(url) {
@@ -39,6 +58,34 @@ function openExternalLink(url) {
         return;
     void shell.openExternal(url);
 }
+function configureLocalServiceCertificateTrust() {
+    let localFingerprint = null;
+    try {
+        localFingerprint = new crypto.X509Certificate(fs.readFileSync(localServiceCertificatePath)).fingerprint256;
+    }
+    catch {
+        // The certificate is created when the local service first enables HTTPS.
+    }
+    if (!localFingerprint)
+        return;
+    session.defaultSession.setCertificateVerifyProc((request, callback) => {
+        let isLocalTarget = false;
+        try {
+            isLocalTarget = isLocalNetworkTarget(new URL(`https://${request.hostname}`));
+        }
+        catch {
+            // Keep Chromium's default verification for malformed hostnames.
+        }
+        let presentedFingerprint = null;
+        try {
+            presentedFingerprint = new crypto.X509Certificate(request.certificate.data).fingerprint256;
+        }
+        catch {
+            // Keep Chromium's default verification if the certificate cannot be parsed.
+        }
+        callback(isLocalTarget && presentedFingerprint === localFingerprint ? 0 : -3);
+    });
+}
 function defaultConfig() {
     return { version: 1, connections: [], lastConnectionUrl: null };
 }
@@ -221,6 +268,26 @@ async function probeService(rawUrl) {
         return { ok: false, url, error: message };
     }
 }
+async function probeServiceWithLocalNetworkPermission(rawUrl) {
+    let probe = await probeService(rawUrl);
+    if (probe.ok)
+        return probe;
+    let parsedProbeUrl;
+    try {
+        parsedProbeUrl = new URL(probe.url);
+    }
+    catch {
+        return probe;
+    }
+    if (!isLocalNetworkTarget(parsedProbeUrl) || !looksLikeLocalNetworkPermissionError(probe.error)) {
+        return probe;
+    }
+    if (!(await requestLocalNetworkPermissionRetry(probe.url))) {
+        return { ...probe, error: 'Termdock 尚未获得 macOS 本地网络权限' };
+    }
+    probe = await probeService(rawUrl);
+    return probe;
+}
 async function getLocalServiceStatus() {
     const state = readServerState();
     if (!state || !isProcessRunning(state.pid)) {
@@ -336,6 +403,8 @@ function desktopRuntimeEnv(runtime = runtimePaths()) {
     const currentPath = process.env.PATH ?? '/usr/bin:/bin:/usr/sbin:/sbin';
     return {
         ...process.env,
+        LANG: process.env.LANG || 'en_US.UTF-8',
+        LC_CTYPE: process.env.LC_CTYPE || process.env.LANG || 'en_US.UTF-8',
         PATH: [runtime.toolchainBin, '/opt/homebrew/bin', '/usr/local/bin', currentPath]
             .filter(Boolean)
             .join(path.delimiter),
@@ -364,6 +433,24 @@ async function waitForLocalService(childPid) {
     }
     return lastProbe;
 }
+async function ensureTmuxUtf8Environment(runtime) {
+    const tmux = path.join(runtime.toolchainBin, 'tmux');
+    if (!fs.existsSync(tmux))
+        return;
+    const locale = desktopRuntimeEnv(runtime).LANG || 'en_US.UTF-8';
+    for (const name of ['LANG', 'LC_CTYPE']) {
+        try {
+            await execFileAsync(tmux, ['set-environment', '-g', name, locale], {
+                timeout: 5_000,
+                maxBuffer: 128 * 1024,
+                env: desktopRuntimeEnv(runtime),
+            });
+        }
+        catch {
+            // tmux is optional and may not have a running server yet.
+        }
+    }
+}
 async function confirmAndStopExisting(status) {
     if (!status.state)
         return true;
@@ -460,6 +547,7 @@ async function startLocalService() {
     if (!probe.ok) {
         throw new Error(`桌面版服务启动失败：${probe.error ?? '未知错误'}。日志：${path.join(termdockDir, 'server.log')}`);
     }
+    await ensureTmuxUtf8Environment(runtime);
     await connectWindow(probe.url);
     return probe;
 }
@@ -504,51 +592,41 @@ async function installCli() {
     return snapshot();
 }
 async function connectWindow(rawUrl) {
-    let probe = await probeService(rawUrl);
-    if (!probe.ok) {
-        let parsedProbeUrl = null;
-        try {
-            parsedProbeUrl = new URL(probe.url);
-        }
-        catch {
-            // The probe already contains the normalized URL validation error.
-        }
-        if (parsedProbeUrl
-            && isLocalNetworkTarget(parsedProbeUrl)
-            && looksLikeLocalNetworkPermissionError(probe.error)) {
-            const shouldRetry = await requestLocalNetworkPermissionRetry(probe.url);
-            if (shouldRetry) {
-                probe = await probeService(rawUrl);
-            }
-            else {
-                return { ...probe, error: 'Termdock 尚未获得 macOS 本地网络权限' };
-            }
-        }
-    }
+    let probe = await probeServiceWithLocalNetworkPermission(rawUrl);
     if (!probe.ok)
         return probe;
     const parsed = new URL(probe.url);
-    while (mainWindow) {
-        activeServiceOrigin = parsed.origin;
+    const key = parsed.origin;
+    const existingWindow = serviceWindows.get(key);
+    if (existingWindow && !existingWindow.isDestroyed()) {
+        existingWindow.show();
+        existingWindow.focus();
+        return probe;
+    }
+    const workspaceWindow = createDesktopWindow({ serviceOrigin: key, label: serviceLabel(probe.url) });
+    serviceWindows.set(key, workspaceWindow);
+    while (!workspaceWindow.isDestroyed()) {
         try {
-            await mainWindow.loadURL(probe.url);
+            await workspaceWindow.loadURL(probe.url);
             const config = readDesktopConfig();
             config.lastConnectionUrl = probe.url;
             const existing = config.connections.find((entry) => entry.url === probe.url);
             if (existing)
                 existing.lastConnectedAt = Date.now();
             writeDesktopConfig(config);
+            workspaceWindow.show();
+            workspaceWindow.focus();
             return probe;
         }
         catch (error) {
-            activeServiceOrigin = null;
-            await showConnectionCenter();
             const message = networkErrorDetails(error);
             if (isLocalNetworkTarget(parsed) && looksLikeLocalNetworkPermissionError(error)) {
                 if (await requestLocalNetworkPermissionRetry(probe.url))
                     continue;
+                workspaceWindow.destroy();
                 return { ...probe, ok: false, error: 'Termdock 尚未获得 macOS 本地网络权限' };
             }
+            workspaceWindow.destroy();
             await showDesktopMessageBox({
                 type: 'error',
                 title: '连接 Termdock 服务失败',
@@ -561,7 +639,9 @@ async function connectWindow(rawUrl) {
     return { ...probe, ok: false, error: 'Termdock 窗口已关闭' };
 }
 async function showConnectionCenter() {
-    activeServiceOrigin = null;
+    if (!mainWindow || mainWindow.isDestroyed()) {
+        mainWindow = createDesktopWindow();
+    }
     const rendererPath = app.isPackaged
         ? path.join(process.resourcesPath, 'renderer', 'index.html')
         : path.join(projectRoot, 'desktop', 'renderer', 'index.html');
@@ -569,10 +649,14 @@ async function showConnectionCenter() {
     mainWindow?.show();
     mainWindow?.focus();
 }
-function createMainWindow() {
+function createDesktopWindow(options) {
     const window = new BrowserWindow({
-        title: 'Termdock',
-        width: 1280,
+        title: options ? `Termdock — ${options.label}` : 'Termdock — 连接中心',
+        show: false,
+        // The web workspace enables its persistent right inspector at 1440px.
+        // Open service windows above that breakpoint so the visible pin action
+        // cannot write a pinned state that the initial layout refuses to render.
+        width: options ? 1500 : 1280,
         height: 820,
         minWidth: 760,
         minHeight: 520,
@@ -586,6 +670,14 @@ function createMainWindow() {
             sandbox: true,
         },
     });
+    if (options)
+        windowServiceOrigins.set(window, options.serviceOrigin);
+    if (options) {
+        window.webContents.on('page-title-updated', (event) => {
+            event.preventDefault();
+            window.setTitle(`Termdock — ${options.label}`);
+        });
+    }
     window.webContents.setWindowOpenHandler(({ url }) => {
         if (isExternalLinkStagingUrl(url)) {
             return {
@@ -614,10 +706,11 @@ function createMainWindow() {
         });
     });
     window.webContents.on('will-navigate', (event, url) => {
-        if (!activeServiceOrigin)
+        const serviceOrigin = windowServiceOrigins.get(window);
+        if (!serviceOrigin)
             return;
         try {
-            if (new URL(url).origin === activeServiceOrigin)
+            if (new URL(url).origin === serviceOrigin)
                 return;
         }
         catch {
@@ -627,24 +720,83 @@ function createMainWindow() {
         openExternalLink(url);
     });
     window.webContents.on('did-finish-load', () => {
-        if (!activeServiceOrigin)
+        if (!windowServiceOrigins.has(window))
             return;
         void window.webContents.insertCSS(`
       html[data-termdock-desktop='true'] {
         --safe-top-inset: max(env(safe-area-inset-top, 0px), 38px) !important;
       }
+      html[data-termdock-desktop='true'] #root {
+        padding-top: 0 !important;
+      }
+      html[data-termdock-desktop='true'] body::after {
+        display: none !important;
+      }
+      html[data-termdock-desktop='true'] #root main > div > div:first-child {
+        padding-left: 80px !important;
+        position: relative;
+        -webkit-app-region: no-drag;
+      }
+      html[data-termdock-desktop='true'] #root main > div > div:first-child::before {
+        content: '';
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 50%;
+        width: min(240px, 25vw);
+        transform: translateX(-50%);
+        pointer-events: none;
+        -webkit-app-region: drag;
+      }
+      html[data-termdock-desktop='true'] #root .h-full.flex.flex-col.app-chrome-bg.border-r > .shrink-0.border-b {
+        padding-left: 80px !important;
+        -webkit-app-region: drag;
+      }
+      html[data-termdock-desktop='true'] #root button,
+      html[data-termdock-desktop='true'] #root a,
+      html[data-termdock-desktop='true'] #root input,
+      html[data-termdock-desktop='true'] #root textarea,
+      html[data-termdock-desktop='true'] #root select,
+      html[data-termdock-desktop='true'] #root [data-rbd-draggable-id] {
+        -webkit-app-region: no-drag;
+      }
+      html[data-termdock-desktop='true'] [data-sidebar='right'] {
+        padding-top: 0 !important;
+      }
+      html[data-termdock-desktop='true'] [data-sidebar='right'][style*='pointer-events: auto'] {
+        transform: none !important;
+      }
+      html[data-termdock-desktop='true'] [data-sidebar='right'] > div:first-child {
+        -webkit-app-region: no-drag;
+      }
+      html[data-termdock-desktop='true'] [data-sidebar='right'] > div:first-child > div:first-child > .min-w-0.flex-1 {
+        -webkit-app-region: drag;
+      }
+      html[data-termdock-desktop='true'] [data-sidebar='right'] div:has(> [data-right-search]) + div:has(> button[aria-pressed]) {
+        width: fit-content !important;
+        margin-left: auto !important;
+      }
+      html[data-termdock-desktop='true'] [data-sidebar='right'] div:has(> [data-right-search]) + div:has(> button[aria-pressed]) > button {
+        flex: none !important;
+        padding: 0.125rem 0.5rem !important;
+        font-size: 10px !important;
+      }
     `);
     });
     window.on('closed', () => {
         if (mainWindow === window)
             mainWindow = null;
+        const serviceOrigin = windowServiceOrigins.get(window);
+        if (serviceOrigin && serviceWindows.get(serviceOrigin) === window) {
+            serviceWindows.delete(serviceOrigin);
+        }
     });
     window.on('focus', () => {
         // User is looking at the app — the Dock badge has served its purpose.
         clearUnreadNotifications();
     });
     window.on('close', (event) => {
-        if (process.platform === 'darwin' && !isQuitting) {
+        if (window === mainWindow && process.platform === 'darwin' && !isQuitting) {
             event.preventDefault();
             window.hide();
         }
@@ -653,7 +805,7 @@ function createMainWindow() {
 }
 function installIpcHandlers() {
     ipcMain.handle('desktop:snapshot', () => snapshot());
-    ipcMain.handle('desktop:probe', (_event, url) => probeService(url));
+    ipcMain.handle('desktop:probe', (_event, url) => probeServiceWithLocalNetworkPermission(url));
     ipcMain.handle('desktop:save-connection', async (_event, input) => {
         const url = normalizeServiceUrl(input.url);
         const config = readDesktopConfig();
@@ -669,12 +821,14 @@ function installIpcHandlers() {
             });
         }
         writeDesktopConfig(config);
+        installMenu();
         return snapshot();
     });
     ipcMain.handle('desktop:remove-connection', async (_event, id) => {
         const config = readDesktopConfig();
         config.connections = config.connections.filter((entry) => entry.id !== id);
         writeDesktopConfig(config);
+        installMenu();
         return snapshot();
     });
     ipcMain.handle('desktop:connect', (_event, url) => connectWindow(url));
@@ -687,7 +841,7 @@ function installIpcHandlers() {
         if (error)
             throw new Error(error);
     });
-    ipcMain.handle('desktop:show-notification', (_event, payload) => {
+    ipcMain.handle('desktop:show-notification', (event, payload) => {
         if (!Notification.isSupported() || typeof payload?.title !== 'string')
             return false;
         // Web Notification tag semantics: a new notification with the same tag
@@ -712,11 +866,15 @@ function installIpcHandlers() {
                     activeNotifications.delete(tag);
             });
         }
+        const sourceWindow = BrowserWindow.fromWebContents(event.sender);
         notification.on('click', () => {
-            mainWindow?.show();
-            mainWindow?.focus();
+            const targetWindow = sourceWindow && !sourceWindow.isDestroyed()
+                ? sourceWindow
+                : focusedWorkspaceWindow();
+            targetWindow?.show();
+            targetWindow?.focus();
             if (typeof payload.sessionId === 'string') {
-                mainWindow?.webContents.send('desktop:focus-session', payload.sessionId);
+                targetWindow?.webContents.send('desktop:focus-session', payload.sessionId);
             }
         });
         notification.show();
@@ -724,7 +882,7 @@ function installIpcHandlers() {
         app.setBadgeCount(unreadNotificationCount);
         // macOS banners auto-dismiss even for "persistent" alerts; bounce the Dock
         // icon so the signal survives until the user looks at the app.
-        if (payload.persistent === true && !mainWindow?.isFocused()) {
+        if (payload.persistent === true && !sourceWindow?.isFocused()) {
             app.dock?.bounce('informational');
         }
         return true;
@@ -732,8 +890,37 @@ function installIpcHandlers() {
 }
 function installMenu() {
     const sendCommand = (command) => {
-        mainWindow?.webContents.send('desktop:command', command);
+        focusedWorkspaceWindow()?.webContents.send('desktop:command', command);
+    };
+    const openService = (url) => {
+        void connectWindow(url).then((probe) => {
+            if (!probe.ok) {
+                void showDesktopMessageBox({
+                    type: 'error',
+                    title: '连接 Termdock 服务失败',
+                    message: `无法打开 ${probe.url}`,
+                    detail: probe.error,
+                });
+            }
+        });
+    };
+    const openLocalService = () => {
+        void getLocalServiceStatus().then((status) => {
+            if (status.running && status.state) {
+                openService(stateUrl(status.state));
+                return;
+            }
+            void showConnectionCenter();
+        });
     };
+    const config = readDesktopConfig();
+    const serviceItems = [
+        { label: '本机', click: openLocalService },
+        ...config.connections.map((connection) => ({
+            label: connection.label || new URL(connection.url).host,
+            click: () => openService(connection.url),
+        })),
+    ];
     const menu = Menu.buildFromTemplate([
         {
             label: 'Termdock',
@@ -743,13 +930,14 @@ function installMenu() {
                 {
                     label: '设置…',
                     accelerator: 'CmdOrCtrl+,',
-                    click: () => mainWindow?.webContents.send('desktop:open-settings'),
+                    click: () => focusedWorkspaceWindow()?.webContents.send('desktop:open-settings'),
                 },
                 {
                     label: '连接中心',
-                    accelerator: 'CmdOrCtrl+Shift+O',
+                    accelerator: 'CmdOrCtrl+N',
                     click: () => void showConnectionCenter(),
                 },
+                { label: '打开服务', submenu: serviceItems },
                 {
                     label: '安装或修复 CLI…',
                     click: () => void installCli().catch((error) => {
@@ -855,6 +1043,13 @@ function installMenu() {
         {
             label: '窗口',
             submenu: [
+                {
+                    label: '连接中心',
+                    accelerator: 'CmdOrCtrl+Shift+O',
+                    click: () => void showConnectionCenter(),
+                },
+                { label: '打开服务', submenu: serviceItems },
+                { type: 'separator' },
                 { role: 'minimize' },
                 { role: 'zoom' },
                 { role: 'front' },
@@ -862,11 +1057,17 @@ function installMenu() {
         },
     ]);
     Menu.setApplicationMenu(menu);
+    app.dock?.setMenu(Menu.buildFromTemplate([
+        { label: '连接中心', click: () => void showConnectionCenter() },
+        { type: 'separator' },
+        ...serviceItems,
+    ]));
 }
 app.whenReady().then(async () => {
+    configureLocalServiceCertificateTrust();
     installIpcHandlers();
     installMenu();
-    mainWindow = createMainWindow();
+    mainWindow = createDesktopWindow();
     configureDesktopUpdater(showDesktopMessageBox);
     await showConnectionCenter();
     const lastConnectionUrl = readDesktopConfig().lastConnectionUrl;
@@ -878,9 +1079,13 @@ app.whenReady().then(async () => {
     }
     app.on('activate', () => {
         if (!mainWindow) {
-            mainWindow = createMainWindow();
+            mainWindow = createDesktopWindow();
             void showConnectionCenter();
         }
+        else {
+            mainWindow.show();
+            mainWindow.focus();
+        }
     });
 }).catch((error) => {
     void dialog.showErrorBox('Termdock 启动失败', error instanceof Error ? error.message : String(error));

package/README.md

@@ -82,8 +82,21 @@ npx termdock --host 127.0.0.1 --port 4000
 termdock --foreground            # 前台运行
 termdock --status                # 查看后台状态
 termdock --stop                  # 停止后台服务
+td update                        # 从 npm 官方源升级全局 CLI
 ```
 
+`td update`（也可写作 `td upgrade`）会优先使用 npm 官方源
+`https://registry.npmjs.org` 查询并安装最新正式版；仅当官方源查询或安装失败时，
+才会回退到本机 `.npmrc` 配置的源（npm 命令不再传入 `--registry`）。
+如果后台服务正在运行，升级不会打断现有终端会话；可在方便时执行
+`td --stop && td`，让服务切换到新版本。
+
+npm CLI 服务也会自动更新：启动 15 秒后检查一次，之后每 6 小时检查。
+新版会在后台安装，但无论是否有网页连接都绝不会自动重启。更新状态会持久保存，
+用户打开网页后可在左侧边栏“更多”按钮看到更新圆点和提醒；只有用户明确确认后
+才会重启，未确认的提醒会一直保留。tmux 和由 PTY host 托管的会话可跨此次重启继续使用。
+macOS 桌面版仍使用独立的签名更新机制，不运行 npm 自动更新器。
+
 ### 设置访问密码（强烈推荐）
 
 如果服务暴露在 LAN 上，**务必先设置密码**，否则任何能访问到主机/端口的人都能执行 shell 命令：