termdock 1.4.290 → 1.4.291

package/.desktop-dist/main.js

@@ -2,6 +2,7 @@ import { readClipboardFiles } from './clipboardFiles.js';
 import { sessionAddress } from './collaborationFederation.js';
 import { prepareServiceFrontend, selectServiceFrontend } from './bundledFrontend.js';
 import { serviceConnection, serviceConnectionKeys, importServiceConnection, saveServiceConnection, invitationForService } from './serviceConnections.js';
+import { serviceMenuEntries } from './serviceMenu.js';
 const pendingServiceInvitations = new WeakMap();
 import { app, BrowserWindow, clipboard, dialog, ipcMain, Menu, net, nativeImage, Notification, powerMonitor, screen, session, shell, Tray, } from 'electron';
 import { execFile } from 'node:child_process';
@@ -1733,13 +1734,15 @@ function installMenu() {
         });
     };
     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 localState = readServerState();
+    const localUrl = localState ? stateUrl(localState) : DEFAULT_LOCAL_URL;
+    const serviceItems = serviceMenuEntries(config.connections, localUrl)
+        .map(({ label, connection }) => ({
+        label,
+        click: connection
+            ? () => openService(connection.serviceOrigin || connection.url)
+            : openLocalService,
+    }));
     const menu = Menu.buildFromTemplate([
         {
             label: 'Termdock',