termdock 1.4.127 → 1.4.129

package/.desktop-dist/main.js

@@ -3,16 +3,19 @@ import { execFile, spawn } from 'node:child_process';
 import crypto from 'node:crypto';
 import dgram from 'node:dgram';
 import fs from 'node:fs';
+import http from 'node:http';
 import https from 'node:https';
 import os from 'node:os';
 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, checkForRuntimeUpdates, configureDesktopUpdater, ensureLatestRuntime, getDesktopUpdateState, getDesktopRuntimeUpdateState, installDownloadedDesktopUpdate, markDesktopRuntimeRestarting, markDesktopRuntimeRunning, subscribeDesktopRuntimeUpdateState, subscribeDesktopUpdateState, } from './updater.js';
+import { checkForDesktopUpdates, checkForRuntimeUpdates, configureDesktopUpdater, ensureLatestRuntime, getDesktopUpdateState, getDesktopRuntimeUpdateState, installDownloadedDesktopUpdate, markDesktopRuntimeRestartFailed, markDesktopRuntimeRestarting, markDesktopRuntimeRunning, subscribeDesktopRuntimeUpdateState, subscribeDesktopUpdateState, } from './updater.js';
 import { resolvePackagedRuntime, rollbackDownloadedRuntime, } from './runtime.js';
 import { isExternalLinkStagingUrl, isSafeExternalUrl } from './externalLinks.js';
 import { shouldThrottleDesktopRenderer } from './windowPolicy.js';
+import { checkConnectedServiceRuntime, getConnectedServiceRuntimeState, restartConnectedServiceRuntime, } from './connectedServiceRuntime.js';
+import { isOwnedDesktopRuntimeTarget } from './runtimeTarget.js';
 import { canOfferCertificateTrust, downloadCertificateAuthority, isCertificateTrustError, isLocalNetworkHostname, } from './certificateTrust.js';
 const execFileAsync = promisify(execFile);
 const currentDir = path.dirname(fileURLToPath(import.meta.url));
@@ -20,6 +23,7 @@ const projectRoot = path.resolve(currentDir, '..');
 const termdockDir = path.join(os.homedir(), '.termdock');
 const desktopConfigPath = path.join(termdockDir, 'desktop.json');
 const serverStatePath = path.join(termdockDir, 'server.json');
+const desktopRuntimeOwnerSocketPath = path.join(termdockDir, 'desktop-runtime-owner.sock');
 const DEFAULT_LOCAL_URL = 'http://localhost:9834';
 const PROTOCOL_VERSION = 1;
 const HEALTH_TIMEOUT_MS = 3_500;
@@ -64,6 +68,9 @@ let menuBarStatus = null;
 let menuBarStatusWidth = 0;
 let floatingWidgetWindow = null;
 let floatingPositionTimer = null;
+let desktopRuntimeOwnerServer = null;
+let connectedServiceRuntimePollTimer = null;
+let connectedServiceRuntimePollInFlight = false;
 let isQuitting = false;
 const FLOATING_WIDGET_WIDTHS = [64, 108, 152];
 const FLOATING_WIDGET_HEIGHT = 40;
@@ -989,6 +996,7 @@ function desktopRuntimeEnv(runtime = runtimePaths()) {
             .filter(Boolean)
             .join(path.delimiter),
         TERMDOCK_DESKTOP: '1',
+        TERMDOCK_DESKTOP_OWNER_SOCKET: desktopRuntimeOwnerSocketPath,
         TERMDOCK_BUNDLED_RUNTIME: app.isPackaged ? '1' : '0',
         TERMDOCK_VERSION: runtime.version,
         TERMDOCK_DESKTOP_SHELL_VERSION: app.getVersion(),
@@ -1134,28 +1142,137 @@ async function startLocalService() {
 }
 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('桌面服务状态已失效，请重新打开连接中心。');
+    const update = getDesktopRuntimeUpdateState();
+    if (!status.running || status.probe?.desktopManaged !== true) {
+        throw new Error('当前服务不是由这个 Termdock Desktop 宿主管理的。');
+    }
+    if (update.status !== 'ready' || !update.latestVersion) {
+        throw new Error('没有等待重启的 Runtime 更新。');
+    }
+    markDesktopRuntimeRestarting();
+    const restartTimer = setTimeout(() => {
+        void (async () => {
+            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();
+        })().catch((error) => {
+            markDesktopRuntimeRestartFailed(error);
+            console.error('[desktop-runtime] restart failed', error);
+        });
+    }, 250);
+    restartTimer.unref();
+    return getDesktopRuntimeUpdateState();
+}
+function isOwnedDesktopRuntimeWindow(window, status) {
+    const origin = windowServiceOrigins.get(window);
+    if (!origin || !status.running || status.probe?.desktopManaged !== true || !status.state)
+        return false;
+    const localAddresses = new Set(Object.values(os.networkInterfaces())
+        .flatMap((addresses) => addresses?.map((address) => address.address.toLowerCase()) ?? []));
+    return isOwnedDesktopRuntimeTarget({
+        origin,
+        servicePort: status.state.port,
+        desktopManaged: true,
+        localAddresses,
+    });
+}
+async function routeRuntimeOperationForWindow(webContents, desktopOperation, serviceOperation) {
+    const sourceWindow = BrowserWindow.fromWebContents(webContents);
+    if (!sourceWindow || !windowServiceOrigins.has(sourceWindow)) {
+        throw new Error('只能从已连接的 Termdock 服务窗口操作 Runtime。');
+    }
+    const status = await getLocalServiceStatus();
+    return isOwnedDesktopRuntimeWindow(sourceWindow, status)
+        ? desktopOperation()
+        : serviceOperation();
+}
+function startConnectedServiceRuntimePolling() {
+    if (connectedServiceRuntimePollTimer)
+        return;
+    const poll = async () => {
+        if (connectedServiceRuntimePollInFlight)
+            return;
+        connectedServiceRuntimePollInFlight = true;
+        try {
+            const status = await getLocalServiceStatus();
+            await Promise.all(BrowserWindow.getAllWindows().map(async (window) => {
+                if (window.isDestroyed() || !windowServiceOrigins.has(window))
+                    return;
+                if (isOwnedDesktopRuntimeWindow(window, status))
+                    return;
+                try {
+                    const state = await getConnectedServiceRuntimeState(window.webContents);
+                    if (!window.isDestroyed()) {
+                        window.webContents.send('desktop:runtime-update-state-changed', state);
+                    }
+                }
+                catch {
+                    // A disconnected or older service will be retried on the next poll.
+                }
+            }));
         }
-        process.kill(pid, 'SIGTERM');
-        const deadline = Date.now() + 15_000;
-        while (isProcessRunning(pid) && Date.now() < deadline) {
-            await new Promise((resolve) => setTimeout(resolve, 150));
+        finally {
+            connectedServiceRuntimePollInFlight = false;
         }
-        if (isProcessRunning(pid))
-            throw new Error(`桌面服务 PID ${pid} 未能正常退出。`);
-        const latest = readServerState();
-        if (latest?.pid === pid)
-            fs.rmSync(serverStatePath, { force: true });
-    }
-    await startLocalService();
-    return getDesktopRuntimeUpdateState();
+    };
+    void poll();
+    connectedServiceRuntimePollTimer = setInterval(() => void poll(), 2_000);
+    connectedServiceRuntimePollTimer.unref();
+}
+function writeRuntimeOwnerResponse(response, statusCode, payload) {
+    response.writeHead(statusCode, { 'content-type': 'application/json; charset=utf-8' });
+    response.end(JSON.stringify(payload));
+}
+async function startDesktopRuntimeOwnerServer() {
+    if (desktopRuntimeOwnerServer)
+        return;
+    fs.mkdirSync(termdockDir, { recursive: true, mode: 0o700 });
+    fs.rmSync(desktopRuntimeOwnerSocketPath, { force: true });
+    const server = http.createServer((request, response) => {
+        void (async () => {
+            if (request.method === 'GET' && request.url === '/runtime-update') {
+                writeRuntimeOwnerResponse(response, 200, getDesktopRuntimeUpdateState());
+                return;
+            }
+            if (request.method === 'POST' && request.url === '/runtime-update/check') {
+                writeRuntimeOwnerResponse(response, 200, await checkForRuntimeUpdates());
+                return;
+            }
+            if (request.method === 'POST' && request.url === '/runtime-update/restart') {
+                writeRuntimeOwnerResponse(response, 202, await restartDesktopManagedRuntime());
+                return;
+            }
+            writeRuntimeOwnerResponse(response, 404, { error: '未知的 Desktop Runtime 操作。' });
+        })().catch((error) => {
+            writeRuntimeOwnerResponse(response, 409, {
+                error: error instanceof Error ? error.message : String(error),
+            });
+        });
+    });
+    await new Promise((resolve, reject) => {
+        server.once('error', reject);
+        server.listen(desktopRuntimeOwnerSocketPath, () => {
+            server.off('error', reject);
+            resolve();
+        });
+    });
+    server.on('error', (error) => {
+        console.error('[desktop-runtime] owner socket failed', error);
+    });
+    fs.chmodSync(desktopRuntimeOwnerSocketPath, 0o600);
+    desktopRuntimeOwnerServer = server;
 }
 function shellQuote(value) {
     return `'${value.replace(/'/g, `'\\''`)}'`;
@@ -1650,9 +1767,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:runtime-update-state', (event) => routeRuntimeOperationForWindow(event.sender, () => getDesktopRuntimeUpdateState(), () => getConnectedServiceRuntimeState(event.sender)));
+    ipcMain.handle('desktop:check-runtime-update', (event) => routeRuntimeOperationForWindow(event.sender, () => checkForRuntimeUpdates(), () => checkConnectedServiceRuntime(event.sender)));
+    ipcMain.handle('desktop:restart-runtime', (event) => routeRuntimeOperationForWindow(event.sender, () => restartDesktopManagedRuntime(), () => restartConnectedServiceRuntime(event.sender)));
     ipcMain.handle('desktop:show-connection-center', () => showConnectionCenter());
     ipcMain.handle('desktop:reveal-data-directory', async () => {
         fs.mkdirSync(termdockDir, { recursive: true, mode: 0o700 });
@@ -1924,6 +2041,7 @@ function installMenu() {
 app.whenReady().then(async () => {
     triggerLocalNetworkPermission();
     configureLocalServiceCertificateTrust();
+    await startDesktopRuntimeOwnerServer();
     installIpcHandlers();
     installMenu();
     refreshDesktopStatusSurfaces();
@@ -1937,11 +2055,15 @@ app.whenReady().then(async () => {
         }
     });
     subscribeDesktopRuntimeUpdateState((state) => {
-        for (const window of BrowserWindow.getAllWindows()) {
-            if (!window.isDestroyed())
-                window.webContents.send('desktop:runtime-update-state-changed', state);
-        }
+        void getLocalServiceStatus().then((status) => {
+            for (const window of BrowserWindow.getAllWindows()) {
+                if (!window.isDestroyed() && isOwnedDesktopRuntimeWindow(window, status)) {
+                    window.webContents.send('desktop:runtime-update-state-changed', state);
+                }
+            }
+        });
     });
+    startConnectedServiceRuntimePolling();
     const startupConfig = readDesktopConfig();
     const restoreUrls = startupConfig.openConnectionUrls;
     startupRestoreActive = true;
@@ -2000,5 +2122,12 @@ app.on('window-all-closed', () => {
 });
 app.on('before-quit', () => {
     isQuitting = true;
+    desktopRuntimeOwnerServer?.close();
+    desktopRuntimeOwnerServer = null;
+    if (connectedServiceRuntimePollTimer)
+        clearInterval(connectedServiceRuntimePollTimer);
+    connectedServiceRuntimePollTimer = null;
+    connectedServiceRuntimePollInFlight = false;
+    fs.rmSync(desktopRuntimeOwnerSocketPath, { force: true });
 });
 export { PROTOCOL_VERSION };