termdock 1.4.182 → 1.4.184

package/.desktop-dist/main.js

@@ -1,6 +1,6 @@
 import { CollaborationFederation, sessionAddress } from './collaborationFederation.js';
 import { prepareBundledFrontend } from './bundledFrontend.js';
-import { serviceConnection, serviceConnectionKeys, importServiceConnection, upsertServiceConnection, invitationForService } from './serviceConnections.js';
+import { serviceConnection, serviceConnectionKeys, importServiceConnection, saveServiceConnection, invitationForService } from './serviceConnections.js';
 const pendingServiceInvitations = new WeakMap();
 import { app, BrowserWindow, clipboard, dialog, ipcMain, Menu, net, nativeImage, Notification, powerMonitor, screen, session, shell, Tray, } from 'electron';
 import { execFile, spawn } from 'node:child_process';
@@ -71,6 +71,7 @@ let mainWindow = null;
 let startupRestoreActive = false;
 let startupProgressMessage = '正在启动 Termdock Desktop…';
 const serviceWindows = new Map();
+const serviceWindowPeers = new WeakMap();
 const windowServiceOrigins = new WeakMap();
 const restorableServiceWindows = new WeakSet();
 const reportedServiceActivity = new Map();
@@ -135,6 +136,7 @@ function serviceActivitySnapshot(targetWindow) {
         const activity = mergeServiceActivity(reportedServiceActivity.get(origin), observedServiceActivity.get(origin));
         return [{
                 origin,
+                targetPeerId: serviceWindowPeers.get(window),
                 label: serviceLabel(origin),
                 current: origin === currentOrigin,
                 focused: window.isFocused(),
@@ -167,6 +169,7 @@ function allServiceActivity() {
             return [];
         return [{
                 origin,
+                targetPeerId: serviceWindowPeers.get(window),
                 label: serviceLabel(origin),
                 current: window === lastFocusedServiceWindow,
                 focused: window === focused,
@@ -1443,8 +1446,20 @@ async function connectWindow(rawUrl, options = {}) {
         return probe;
     const parsed = new URL(probe.url);
     const key = parsed.origin;
-    const existingWindow = serviceWindows.get(key);
+    const existingWindow = serviceWindows.get(key) ?? (known?.targetPeerId && !options.invitation
+        ? [...serviceWindows.values()].find(window => !window.isDestroyed() && serviceWindowPeers.get(window) === known.targetPeerId)
+        : undefined);
     if (existingWindow && !existingWindow.isDestroyed()) {
+        const existingOrigin = windowServiceOrigins.get(existingWindow);
+        // An alternate address is still the same service. Keep the existing
+        // renderer and its storage partition instead of navigating it across origins.
+        if (existingOrigin && existingOrigin !== key) {
+            if (options.focus !== false) {
+                mainWindow?.hide();
+                showAndFocusWindow(existingWindow);
+            }
+            return { ok: true, url: existingOrigin };
+        }
         if (options.persist !== false) {
             const config = readDesktopConfig();
             if (options.updateLastConnection !== false)
@@ -1480,6 +1495,8 @@ async function connectWindow(rawUrl, options = {}) {
         return probe;
     }
     const workspaceWindow = createDesktopWindow({ serviceOrigin: key, label: serviceLabel(probe.url) });
+    if (known?.targetPeerId)
+        serviceWindowPeers.set(workspaceWindow, known.targetPeerId);
     await prepareBundledFrontend(workspaceWindow.webContents.session, key, () => path.join(runtimePaths().serverRoot, 'dist', 'client'));
     if (options.invitation)
         pendingServiceInvitations.set(workspaceWindow, options.invitation);
@@ -1900,6 +1917,12 @@ function installIpcHandlers() {
         return window;
     };
     const directoryChanged = () => {
+        const connections = readDesktopConfig().connections;
+        for (const [origin, window] of serviceWindows) {
+            const connection = connections.find(item => (item.serviceOrigin || item.url) === origin);
+            if (connection?.targetPeerId)
+                serviceWindowPeers.set(window, connection.targetPeerId);
+        }
         installMenu();
         for (const window of BrowserWindow.getAllWindows())
             window.webContents.send('desktop:service-connections-changed');
@@ -1909,7 +1932,7 @@ function installIpcHandlers() {
     ipcMain.handle('desktop:save-service-connection', (event, input) => {
         directorySender(event);
         const config = readDesktopConfig();
-        config.connections = upsertServiceConnection(config.connections, input);
+        Object.assign(config, saveServiceConnection(config.connections, config.removedServiceKeys || [], input));
         writeDesktopConfig(config);
         directoryChanged();
         return config.connections;
@@ -1945,7 +1968,7 @@ function installIpcHandlers() {
         const connection = serviceConnection(input), invitation = invitationForService(rawInvitation, connection);
         // A bookmark pin is connection metadata, never authorization to the service.
         const config = readDesktopConfig();
-        config.connections = upsertServiceConnection(config.connections, connection);
+        Object.assign(config, saveServiceConnection(config.connections, config.removedServiceKeys || [], connection));
         writeDesktopConfig(config);
         directoryChanged();
         return connectWindow(connection.serviceOrigin || connection.url, { invitation });
@@ -1961,16 +1984,11 @@ function installIpcHandlers() {
         const url = normalizeServiceUrl(input.url);
         const config = readDesktopConfig();
         const existing = config.connections.find((entry) => entry.url === url);
-        if (existing) {
-            existing.label = input.label.trim() || new URL(url).host;
-        }
-        else {
-            config.connections.push({
-                id: crypto.randomUUID(),
-                label: input.label.trim() || new URL(url).host,
-                url,
-            });
-        }
+        Object.assign(config, saveServiceConnection(config.connections, config.removedServiceKeys || [], {
+            id: existing?.id || crypto.randomUUID(),
+            label: input.label.trim() || new URL(url).host,
+            url,
+        }));
         writeDesktopConfig(config);
         installMenu();
         return snapshot();