termdock 1.4.183 → 1.4.185

package/.desktop-dist/main.js

@@ -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');