termdock 1.4.123 → 1.4.125

package/.desktop-dist/main.js

@@ -9,7 +9,7 @@ import path from 'node:path';
 import { promisify } from 'node:util';
 import { fileURLToPath } from 'node:url';
 import { desktopStatusTooltip, formatCompactDesktopStatus, menuBarStatusRows, mergeServiceActivity, nextServiceOrigin, normalizeServiceActivity, summarizeServiceActivity, } from './activityStatus.js';
-import { checkForDesktopUpdates, configureDesktopUpdater, ensureLatestRuntime, getDesktopUpdateState, installDownloadedDesktopUpdate, subscribeDesktopUpdateState, } from './updater.js';
+import { checkForDesktopUpdates, checkForRuntimeUpdates, configureDesktopUpdater, ensureLatestRuntime, getDesktopUpdateState, getDesktopRuntimeUpdateState, installDownloadedDesktopUpdate, markDesktopRuntimeRestarting, markDesktopRuntimeRunning, subscribeDesktopRuntimeUpdateState, subscribeDesktopUpdateState, } from './updater.js';
 import { resolvePackagedRuntime, rollbackDownloadedRuntime, } from './runtime.js';
 import { isExternalLinkStagingUrl, isSafeExternalUrl } from './externalLinks.js';
 import { shouldThrottleDesktopRenderer } from './windowPolicy.js';
@@ -24,6 +24,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 RESTORE_LOAD_TIMEOUT_MS = 15_000;
 const localServiceCertificatePath = path.join(termdockDir, 'certs', 'termdock-local.pem');
 const sessionTrustedCertificateTargets = new Set();
 const sessionTrustedCertificateAuthorities = new Map();
@@ -51,6 +52,8 @@ function triggerLocalNetworkPermission() {
     socket.send(Buffer.from('Termdock'), 5353, '224.0.0.251', close);
 }
 let mainWindow = null;
+let startupRestoreActive = false;
+let startupProgressMessage = '正在启动 Termdock Desktop…';
 const serviceWindows = new Map();
 const windowServiceOrigins = new WeakMap();
 const restorableServiceWindows = new WeakSet();
@@ -752,6 +755,7 @@ async function probeServiceWithCertificateAuthority(rawUrl, certificateAuthority
                     protocolVersion: typeof metadata?.protocolVersion === 'number'
                         ? metadata.protocolVersion
                         : undefined,
+                    desktopManaged: metadata?.desktopManaged === true,
                 };
             }
         }
@@ -795,6 +799,7 @@ async function probeService(rawUrl) {
                     protocolVersion: typeof metadata.protocolVersion === 'number'
                         ? metadata.protocolVersion
                         : undefined,
+                    desktopManaged: metadata.desktopManaged === true,
                 };
             }
         }
@@ -811,7 +816,7 @@ async function probeService(rawUrl) {
         return { ok: false, url, error: message };
     }
 }
-async function probeServiceWithLocalNetworkPermission(rawUrl) {
+async function probeServiceWithLocalNetworkPermission(rawUrl, options = {}) {
     let normalizedUrl;
     try {
         normalizedUrl = normalizeServiceUrl(rawUrl);
@@ -838,6 +843,8 @@ async function probeServiceWithLocalNetworkPermission(rawUrl) {
         return probe;
     }
     if (canOfferCertificateTrust(probe.url) && isCertificateTrustError(probe.error)) {
+        if (options.interactive === false)
+            return probe;
         const certificate = await requestCertificateTrust(probe.url);
         if (!certificate) {
             return { ...probe, error: 'HTTPS 证书尚未受信任' };
@@ -847,6 +854,8 @@ async function probeServiceWithLocalNetworkPermission(rawUrl) {
     if (!isLocalNetworkTarget(parsedProbeUrl) || !looksLikeLocalNetworkPermissionError(probe.error)) {
         return probe;
     }
+    if (options.interactive === false)
+        return probe;
     if (!(await requestLocalNetworkPermissionRetry(probe.url))) {
         return { ...probe, error: 'Termdock 尚未获得 macOS 本地网络权限' };
     }
@@ -967,11 +976,16 @@ async function snapshot() {
 }
 function desktopRuntimeEnv(runtime = runtimePaths()) {
     const currentPath = process.env.PATH ?? '/usr/bin:/bin:/usr/sbin:/sbin';
+    const userBinPaths = [
+        path.join(os.homedir(), '.local', 'bin'),
+        path.join(os.homedir(), 'bin'),
+        path.join(os.homedir(), '.npm-global', 'bin'),
+    ];
     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]
+        PATH: [runtime.toolchainBin, ...userBinPaths, '/opt/homebrew/bin', '/usr/local/bin', currentPath]
             .filter(Boolean)
             .join(path.delimiter),
         TERMDOCK_DESKTOP: '1',
@@ -1114,9 +1128,35 @@ async function startLocalService() {
         throw new Error(`桌面版服务启动失败：${probe.error ?? '未知错误'}。日志：${path.join(termdockDir, 'server.log')}`);
     }
     await ensureTmuxUtf8Environment(runtime);
+    markDesktopRuntimeRunning(runtime.version);
     await connectWindow(probe.url);
     return probe;
 }
+async function restartDesktopManagedRuntime() {
+    const status = await getLocalServiceStatus();
+    if (status.running) {
+        if (status.probe?.desktopManaged !== true) {
+            throw new Error('当前本机服务不是由桌面版启动的，不能由桌面版自动重启。');
+        }
+        markDesktopRuntimeRestarting();
+        const pid = status.state?.pid;
+        if (!pid || !isProcessRunning(pid)) {
+            throw new Error('桌面服务状态已失效，请重新打开连接中心。');
+        }
+        process.kill(pid, 'SIGTERM');
+        const deadline = Date.now() + 15_000;
+        while (isProcessRunning(pid) && Date.now() < deadline) {
+            await new Promise((resolve) => setTimeout(resolve, 150));
+        }
+        if (isProcessRunning(pid))
+            throw new Error(`桌面服务 PID ${pid} 未能正常退出。`);
+        const latest = readServerState();
+        if (latest?.pid === pid)
+            fs.rmSync(serverStatePath, { force: true });
+    }
+    await startLocalService();
+    return getDesktopRuntimeUpdateState();
+}
 function shellQuote(value) {
     return `'${value.replace(/'/g, `'\\''`)}'`;
 }
@@ -1158,46 +1198,16 @@ async function installCli() {
     return snapshot();
 }
 async function connectWindow(rawUrl, options = {}) {
-    let probe = await probeServiceWithLocalNetworkPermission(rawUrl);
+    let probe = await probeServiceWithLocalNetworkPermission(rawUrl, {
+        interactive: options.focus !== false,
+    });
     if (!probe.ok)
         return probe;
     const parsed = new URL(probe.url);
     const key = parsed.origin;
     const existingWindow = serviceWindows.get(key);
     if (existingWindow && !existingWindow.isDestroyed()) {
-        const config = readDesktopConfig();
-        if (options.updateLastConnection !== false)
-            config.lastConnectionUrl = probe.url;
-        config.openConnectionUrls = [
-            ...config.openConnectionUrls.filter((url) => {
-                try {
-                    return new URL(url).origin !== key;
-                }
-                catch {
-                    return false;
-                }
-            }),
-            probe.url,
-        ];
-        const existing = config.connections.find((entry) => entry.url === probe.url);
-        if (existing)
-            existing.lastConnectedAt = Date.now();
-        writeDesktopConfig(config);
-        if (options.focus !== false) {
-            mainWindow?.hide();
-            showAndFocusWindow(existingWindow);
-        }
-        else {
-            existingWindow.showInactive();
-        }
-        return probe;
-    }
-    const workspaceWindow = createDesktopWindow({ serviceOrigin: key, label: serviceLabel(probe.url) });
-    serviceWindows.set(key, workspaceWindow);
-    broadcastServiceActivity();
-    while (!workspaceWindow.isDestroyed()) {
-        try {
-            await workspaceWindow.loadURL(probe.url);
+        if (options.persist !== false) {
             const config = readDesktopConfig();
             if (options.updateLastConnection !== false)
                 config.lastConnectionUrl = probe.url;
@@ -1216,6 +1226,54 @@ async function connectWindow(rawUrl, options = {}) {
             if (existing)
                 existing.lastConnectedAt = Date.now();
             writeDesktopConfig(config);
+        }
+        if (options.focus !== false) {
+            mainWindow?.hide();
+            showAndFocusWindow(existingWindow);
+        }
+        else {
+            existingWindow.showInactive();
+        }
+        return probe;
+    }
+    const workspaceWindow = createDesktopWindow({ serviceOrigin: key, label: serviceLabel(probe.url) });
+    serviceWindows.set(key, workspaceWindow);
+    broadcastServiceActivity();
+    while (!workspaceWindow.isDestroyed()) {
+        try {
+            const load = workspaceWindow.loadURL(probe.url);
+            if (options.focus === false) {
+                await Promise.race([
+                    load,
+                    new Promise((_resolve, reject) => {
+                        const timer = setTimeout(() => reject(new Error('恢复连接超时')), RESTORE_LOAD_TIMEOUT_MS);
+                        timer.unref();
+                    }),
+                ]);
+            }
+            else {
+                await load;
+            }
+            if (options.persist !== false) {
+                const config = readDesktopConfig();
+                if (options.updateLastConnection !== false)
+                    config.lastConnectionUrl = probe.url;
+                config.openConnectionUrls = [
+                    ...config.openConnectionUrls.filter((url) => {
+                        try {
+                            return new URL(url).origin !== key;
+                        }
+                        catch {
+                            return false;
+                        }
+                    }),
+                    probe.url,
+                ];
+                const existing = config.connections.find((entry) => entry.url === probe.url);
+                if (existing)
+                    existing.lastConnectedAt = Date.now();
+                writeDesktopConfig(config);
+            }
             restorableServiceWindows.add(workspaceWindow);
             if (options.focus !== false) {
                 mainWindow?.hide();
@@ -1231,6 +1289,10 @@ async function connectWindow(rawUrl, options = {}) {
         }
         catch (error) {
             const message = networkErrorDetails(error);
+            if (options.focus === false) {
+                workspaceWindow.destroy();
+                return { ...probe, ok: false, error: message };
+            }
             if (isLocalNetworkTarget(parsed) && looksLikeLocalNetworkPermissionError(error)) {
                 if (await requestLocalNetworkPermissionRetry(probe.url))
                     continue;
@@ -1260,6 +1322,29 @@ async function showConnectionCenter() {
     if (mainWindow)
         showAndFocusWindow(mainWindow);
 }
+async function showStartupProgress(message) {
+    if (!startupRestoreActive)
+        return;
+    startupProgressMessage = message;
+    await showConnectionCenter();
+    if (!startupRestoreActive || !mainWindow || mainWindow.isDestroyed())
+        return;
+    mainWindow.webContents.send('desktop:startup-progress', startupProgressMessage);
+}
+function updateStartupProgress(message) {
+    if (!startupRestoreActive)
+        return;
+    startupProgressMessage = message;
+    if (mainWindow && !mainWindow.isDestroyed()) {
+        mainWindow.webContents.send('desktop:startup-progress', startupProgressMessage);
+    }
+}
+function finishStartupProgress() {
+    startupRestoreActive = false;
+    if (!mainWindow || mainWindow.isDestroyed())
+        return;
+    mainWindow.webContents.send('desktop:startup-progress', null);
+}
 function createDesktopWindow(options) {
     const serviceSession = options
         ? session.fromPartition(`persist:termdock-service-${crypto
@@ -1555,6 +1640,9 @@ function installIpcHandlers() {
     ipcMain.handle('desktop:update-state', () => getDesktopUpdateState());
     ipcMain.handle('desktop:check-update', () => checkForDesktopUpdates());
     ipcMain.handle('desktop:install-update', () => installDownloadedDesktopUpdate());
+    ipcMain.handle('desktop:runtime-update-state', () => getDesktopRuntimeUpdateState());
+    ipcMain.handle('desktop:check-runtime-update', () => checkForRuntimeUpdates());
+    ipcMain.handle('desktop:restart-runtime', () => restartDesktopManagedRuntime());
     ipcMain.handle('desktop:show-connection-center', () => showConnectionCenter());
     ipcMain.handle('desktop:reveal-data-directory', async () => {
         fs.mkdirSync(termdockDir, { recursive: true, mode: 0o700 });
@@ -1838,14 +1926,34 @@ app.whenReady().then(async () => {
                 window.webContents.send('desktop:update-state-changed', state);
         }
     });
+    subscribeDesktopRuntimeUpdateState((state) => {
+        for (const window of BrowserWindow.getAllWindows()) {
+            if (!window.isDestroyed())
+                window.webContents.send('desktop:runtime-update-state-changed', state);
+        }
+    });
     const startupConfig = readDesktopConfig();
     const restoreUrls = startupConfig.openConnectionUrls;
-    let restoredWindowCount = 0;
-    for (const url of restoreUrls) {
-        const probe = await connectWindow(url, { focus: false, updateLastConnection: false });
-        if (probe.ok)
-            restoredWindowCount += 1;
-    }
+    startupRestoreActive = true;
+    const startupProgressTimer = setTimeout(() => {
+        void showStartupProgress('正在检查本机 Runtime 和已保存连接…');
+    }, 350);
+    startupProgressTimer.unref();
+    let completedRestores = 0;
+    updateStartupProgress(`正在恢复连接 0/${restoreUrls.length}…`);
+    const restoreResults = await Promise.all(restoreUrls.map(async (url) => {
+        const probe = await connectWindow(url, {
+            focus: false,
+            updateLastConnection: false,
+            persist: false,
+        });
+        completedRestores += 1;
+        updateStartupProgress(`正在恢复连接 ${completedRestores}/${restoreUrls.length}…`);
+        return probe;
+    }));
+    const restoredWindowCount = restoreResults.filter((probe) => probe.ok).length;
+    clearTimeout(startupProgressTimer);
+    finishStartupProgress();
     if (restoredWindowCount > 0) {
         let preferredOrigin = null;
         try {