termdock 1.4.181 → 1.4.183

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';
@@ -1866,8 +1866,15 @@ function installIpcHandlers() {
             throw new Error('未授权的服务窗口');
         return origin;
     };
+    ipcMain.handle('desktop:collaboration-peers', (event) => collaborationFederation.peers(collaborationOrigin(event)));
     ipcMain.handle('desktop:collaboration-list', (event) => collaborationFederation.list(collaborationOrigin(event)));
-    ipcMain.handle('desktop:collaboration-save', (event, input) => collaborationFederation.save(collaborationOrigin(event), input));
+    ipcMain.handle('desktop:collaboration-save', (event, input) => {
+        const origin = collaborationOrigin(event);
+        if (input?.expectedOrigin !== undefined && input.expectedOrigin !== origin) {
+            throw new Error('当前服务与客户端窗口不一致，请在目标服务窗口中添加跨服务成员');
+        }
+        return collaborationFederation.save(origin, input);
+    });
     ipcMain.handle('desktop:collaboration-remove', (event, id) => collaborationFederation.remove(collaborationOrigin(event), id));
     ipcMain.handle('desktop:collaboration-focus', (event, id) => {
         collaborationOrigin(event);
@@ -1902,7 +1909,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;
@@ -1938,7 +1945,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 });
@@ -1954,16 +1961,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();