termdock 1.4.109 → 1.4.110

package/.desktop-dist/main.js

@@ -53,13 +53,17 @@ function triggerLocalNetworkPermission() {
 let mainWindow = null;
 const serviceWindows = new Map();
 const windowServiceOrigins = new WeakMap();
+const restorableServiceWindows = new WeakSet();
 const reportedServiceActivity = new Map();
 const observedServiceActivity = new Map();
 let lastFocusedServiceWindow = null;
 let menuBarStatus = null;
+let menuBarStatusWidth = 0;
 let floatingWidgetWindow = null;
 let floatingPositionTimer = null;
 let isQuitting = false;
+const FLOATING_WIDGET_WIDTHS = [64, 108, 152];
+const FLOATING_WIDGET_HEIGHT = 40;
 function focusedWorkspaceWindow() {
     const focused = BrowserWindow.getFocusedWindow();
     if (focused && windowServiceOrigins.has(focused))
@@ -182,25 +186,90 @@ function menuBarContextMenu() {
         { role: 'quit' },
     ]);
 }
+function menuBarStatusImage(status) {
+    const size = 18;
+    const scale = 2;
+    const bitmap = Buffer.alloc(size * scale * size * scale * 4);
+    const glyphs = {
+        '0': ['111', '101', '101', '101', '111'],
+        '1': ['010', '110', '010', '010', '111'],
+        '2': ['111', '001', '111', '100', '111'],
+        '3': ['111', '001', '111', '001', '111'],
+        '4': ['101', '101', '111', '001', '001'],
+        '5': ['111', '100', '111', '001', '111'],
+        '6': ['111', '100', '111', '101', '111'],
+        '7': ['111', '001', '010', '010', '010'],
+        '8': ['111', '101', '111', '101', '111'],
+        '9': ['111', '101', '111', '001', '111'],
+        '+': ['000', '010', '111', '010', '000'],
+    };
+    const drawPixel = (x, y, alpha = 255) => {
+        for (let offsetY = 0; offsetY < scale; offsetY += 1) {
+            for (let offsetX = 0; offsetX < scale; offsetX += 1) {
+                const pixelX = x * scale + offsetX;
+                const pixelY = y * scale + offsetY;
+                if (pixelX < 0 || pixelX >= size * scale || pixelY < 0 || pixelY >= size * scale)
+                    continue;
+                bitmap[(pixelY * size * scale + pixelX) * 4 + 3] = alpha;
+            }
+        }
+    };
+    const drawGlyph = (value, x, y, alpha) => {
+        const glyph = glyphs[value > 9 ? '+' : String(value)] ?? glyphs['0'];
+        glyph.forEach((row, rowIndex) => {
+            [...row].forEach((cell, columnIndex) => {
+                if (cell === '1')
+                    drawPixel(x + columnIndex, y + rowIndex, alpha);
+            });
+        });
+    };
+    // Three quiet, consistently aligned rows read much better at menu-bar size
+    // than squeezing two metrics beside each other. The ordering mirrors the
+    // floating widget: running, review, then connected services.
+    const rows = [
+        { value: status.runningCount, y: 0, icon: [[0, 0], [0, 1], [1, 1], [0, 2], [1, 2], [2, 2], [3, 2], [0, 3], [1, 3], [0, 4]] },
+        { value: status.reviewCount, y: 6, icon: [[2, 0], [1, 1], [3, 1], [0, 2], [4, 2], [1, 3], [3, 3], [2, 4]] },
+        { value: status.serviceCount, y: 12, icon: [[0, 0], [1, 0], [3, 0], [4, 0], [1, 1], [3, 1], [2, 2], [2, 3], [1, 4], [2, 4], [3, 4]] },
+    ];
+    rows.forEach(({ value, y, icon }) => {
+        const alpha = value > 0 ? 255 : 96;
+        icon.forEach(([offsetX, offsetY]) => drawPixel(1 + offsetX, y + offsetY, alpha));
+        drawGlyph(value, 11, y, alpha);
+    });
+    // Template images are intentionally monochrome; macOS supplies the correct
+    // menu-bar color for the active appearance and accessibility state.
+    const image = nativeImage.createFromBitmap(bitmap, {
+        width: size * scale,
+        height: size * scale,
+        scaleFactor: scale,
+    });
+    image.setTemplateImage(true);
+    return image;
+}
 function refreshMenuBarStatus(status) {
     if (process.platform !== 'darwin' || !status.preferences.menuBarStatusEnabled) {
         menuBarStatus?.destroy();
         menuBarStatus = null;
+        menuBarStatusWidth = 0;
         return;
     }
-    if (!menuBarStatus || menuBarStatus.isDestroyed()) {
-        // An empty NativeImage creates a title-only NSStatusItem: no app icon and
-        // no icon-width spacer, which is the compact mode requested by users.
-        menuBarStatus = new Tray(nativeImage.createEmpty());
+    const image = menuBarStatusImage(status);
+    const imageWidth = image.getSize().width;
+    if (!menuBarStatus || menuBarStatus.isDestroyed() || menuBarStatusWidth !== imageWidth) {
+        menuBarStatus?.destroy();
+        menuBarStatus = new Tray(image);
+        menuBarStatusWidth = imageWidth;
         menuBarStatus.on('click', () => focusNextService('attention'));
         menuBarStatus.on('right-click', () => menuBarStatus?.popUpContextMenu(menuBarContextMenu()));
     }
-    menuBarStatus.setTitle(status.text);
+    else {
+        menuBarStatus.setImage(image);
+    }
+    menuBarStatus.setTitle('');
     menuBarStatus.setToolTip(`${status.tooltip}\n点击循环切换需关注的服务`);
 }
-function constrainFloatingPosition(position) {
-    const width = 212;
-    const height = 50;
+function constrainFloatingPosition(position, width = FLOATING_WIDGET_WIDTHS[2]) {
+    const height = FLOATING_WIDGET_HEIGHT;
     const display = position
         ? screen.getDisplayMatching({ x: position.x, y: position.y, width, height })
         : screen.getPrimaryDisplay();
@@ -219,20 +288,21 @@ function createFloatingWidget(position) {
     const window = new BrowserWindow({
         title: 'Termdock Status',
         type: 'panel',
-        width: 212,
-        height: 50,
+        width: FLOATING_WIDGET_WIDTHS[2],
+        height: FLOATING_WIDGET_HEIGHT,
         x: bounds.x,
         y: bounds.y,
         show: false,
         frame: false,
         transparent: true,
         backgroundColor: 'rgba(0, 0, 0, 0)',
-        vibrancy: 'hud',
+        vibrancy: 'popover',
         visualEffectState: 'active',
         resizable: false,
         maximizable: false,
         minimizable: false,
         fullscreenable: false,
+        focusable: false,
         skipTaskbar: true,
         alwaysOnTop: true,
         acceptFirstMouse: true,
@@ -246,7 +316,13 @@ function createFloatingWidget(position) {
         },
     });
     window.setAlwaysOnTop(true, 'floating');
-    window.setVisibleOnAllWorkspaces(true, { visibleOnFullScreen: true });
+    window.setVisibleOnAllWorkspaces(true, {
+        visibleOnFullScreen: true,
+        // Electron otherwise temporarily transforms the whole process into a UI
+        // element, which can hide the app menu and remove normal windows from App
+        // Expose while this panel exists.
+        skipTransformProcessType: true,
+    });
     // Keep the auxiliary status panel out of App Expose / Mission Control so it
     // cannot disrupt macOS's three-finger application-window gesture.
     window.setHiddenInMissionControl(true);
@@ -255,7 +331,8 @@ function createFloatingWidget(position) {
         if (constrainingMove || window.isDestroyed())
             return;
         const [x, y] = window.getPosition();
-        const constrained = constrainFloatingPosition({ x, y });
+        const [width] = window.getSize();
+        const constrained = constrainFloatingPosition({ x, y }, width);
         if (constrained.x === x && constrained.y === y)
             return;
         constrainingMove = true;
@@ -285,6 +362,20 @@ function createFloatingWidget(position) {
     void window.loadFile(rendererPath).then(() => window.showInactive());
     return window;
 }
+function resizeFloatingWidget(metricCount) {
+    const window = floatingWidgetWindow;
+    if (!window || window.isDestroyed())
+        return;
+    const safeCount = Math.min(3, Math.max(1, Math.round(metricCount)));
+    const width = FLOATING_WIDGET_WIDTHS[safeCount - 1];
+    const [currentWidth] = window.getSize();
+    if (currentWidth === width)
+        return;
+    const [x, y] = window.getPosition();
+    window.setSize(width, FLOATING_WIDGET_HEIGHT, false);
+    const constrained = constrainFloatingPosition({ x: x + currentWidth - width, y }, width);
+    window.setPosition(constrained.x, constrained.y, false);
+}
 function refreshFloatingWidget(status) {
     if (process.platform !== 'darwin' || !status.preferences.floatingWidgetEnabled) {
         if (floatingWidgetWindow && !floatingWidgetWindow.isDestroyed())
@@ -300,7 +391,8 @@ function keepFloatingWidgetOnScreen() {
     if (!floatingWidgetWindow || floatingWidgetWindow.isDestroyed())
         return;
     const [x, y] = floatingWidgetWindow.getPosition();
-    const constrained = constrainFloatingPosition({ x, y });
+    const [width] = floatingWidgetWindow.getSize();
+    const constrained = constrainFloatingPosition({ x, y }, width);
     if (constrained.x !== x || constrained.y !== y) {
         floatingWidgetWindow.setPosition(constrained.x, constrained.y, false);
     }
@@ -379,6 +471,7 @@ function defaultConfig() {
         version: 1,
         connections: [],
         lastConnectionUrl: null,
+        openConnectionUrls: [],
         trustedCertificateAuthorities: [],
         desktopPreferences: {
             menuBarStatusEnabled: true,
@@ -517,13 +610,20 @@ function readDesktopConfig() {
         const parsed = JSON.parse(fs.readFileSync(desktopConfigPath, 'utf8'));
         if (parsed.version !== 1 || !Array.isArray(parsed.connections))
             return defaultConfig();
+        const lastConnectionUrl = typeof parsed.lastConnectionUrl === 'string' ? parsed.lastConnectionUrl : null;
         return {
             version: 1,
             connections: parsed.connections.filter((entry) => Boolean(entry)
                 && typeof entry.id === 'string'
                 && typeof entry.label === 'string'
                 && typeof entry.url === 'string'),
-            lastConnectionUrl: typeof parsed.lastConnectionUrl === 'string' ? parsed.lastConnectionUrl : null,
+            lastConnectionUrl,
+            // Older desktop.json files only remembered the most recent window. Use
+            // that value once as their restore list, while preserving an explicit
+            // empty list when the user intentionally closed every service window.
+            openConnectionUrls: Array.isArray(parsed.openConnectionUrls)
+                ? parsed.openConnectionUrls.filter((url) => typeof url === 'string')
+                : lastConnectionUrl ? [lastConnectionUrl] : [],
             trustedCertificateAuthorities: Array.isArray(parsed.trustedCertificateAuthorities)
                 ? parsed.trustedCertificateAuthorities.filter((entry) => Boolean(entry)
                     && typeof entry.origin === 'string'
@@ -1057,7 +1157,7 @@ async function installCli() {
     ], { timeout: 120_000, maxBuffer: 256 * 1024 });
     return snapshot();
 }
-async function connectWindow(rawUrl) {
+async function connectWindow(rawUrl, options = {}) {
     let probe = await probeServiceWithLocalNetworkPermission(rawUrl);
     if (!probe.ok)
         return probe;
@@ -1066,13 +1166,30 @@ async function connectWindow(rawUrl) {
     const existingWindow = serviceWindows.get(key);
     if (existingWindow && !existingWindow.isDestroyed()) {
         const config = readDesktopConfig();
-        config.lastConnectionUrl = probe.url;
+        if (options.updateLastConnection !== false)
+            config.lastConnectionUrl = probe.url;
+        config.openConnectionUrls = [
+            ...config.openConnectionUrls.filter((url) => {
+                try {
+                    return new URL(url).origin !== key;
+                }
+                catch {
+                    return false;
+                }
+            }),
+            probe.url,
+        ];
         const existing = config.connections.find((entry) => entry.url === probe.url);
         if (existing)
             existing.lastConnectedAt = Date.now();
         writeDesktopConfig(config);
-        mainWindow?.hide();
-        showAndFocusWindow(existingWindow);
+        if (options.focus !== false) {
+            mainWindow?.hide();
+            showAndFocusWindow(existingWindow);
+        }
+        else {
+            existingWindow.showInactive();
+        }
         return probe;
     }
     const workspaceWindow = createDesktopWindow({ serviceOrigin: key, label: serviceLabel(probe.url) });
@@ -1082,13 +1199,34 @@ async function connectWindow(rawUrl) {
         try {
             await workspaceWindow.loadURL(probe.url);
             const config = readDesktopConfig();
-            config.lastConnectionUrl = probe.url;
+            if (options.updateLastConnection !== false)
+                config.lastConnectionUrl = probe.url;
+            config.openConnectionUrls = [
+                ...config.openConnectionUrls.filter((url) => {
+                    try {
+                        return new URL(url).origin !== key;
+                    }
+                    catch {
+                        return false;
+                    }
+                }),
+                probe.url,
+            ];
             const existing = config.connections.find((entry) => entry.url === probe.url);
             if (existing)
                 existing.lastConnectedAt = Date.now();
             writeDesktopConfig(config);
-            mainWindow?.hide();
-            showAndFocusWindow(workspaceWindow);
+            restorableServiceWindows.add(workspaceWindow);
+            if (options.focus !== false) {
+                mainWindow?.hide();
+                showAndFocusWindow(workspaceWindow);
+            }
+            else {
+                // Restored workspaces must be real visible macOS windows so App Expose
+                // can select them, but opening several at launch must not steal focus
+                // from each other.
+                workspaceWindow.showInactive();
+            }
             return probe;
         }
         catch (error) {
@@ -1291,6 +1429,19 @@ function createDesktopWindow(options) {
         clearUnreadNotifications();
     });
     window.on('close', (event) => {
+        const serviceOrigin = windowServiceOrigins.get(window);
+        if (serviceOrigin && !isQuitting && restorableServiceWindows.has(window)) {
+            const config = readDesktopConfig();
+            config.openConnectionUrls = config.openConnectionUrls.filter((url) => {
+                try {
+                    return new URL(url).origin !== serviceOrigin;
+                }
+                catch {
+                    return false;
+                }
+            });
+            writeDesktopConfig(config);
+        }
         if (window === mainWindow && process.platform === 'darwin' && !isQuitting) {
             event.preventDefault();
             window.hide();
@@ -1390,6 +1541,12 @@ function installIpcHandlers() {
             : 'attention';
         focusNextService(normalized);
     });
+    ipcMain.handle('desktop:set-floating-metric-count', (event, count) => {
+        const sourceWindow = BrowserWindow.fromWebContents(event.sender);
+        if (sourceWindow !== floatingWidgetWindow || typeof count !== 'number' || !Number.isFinite(count))
+            return;
+        resizeFloatingWidget(count);
+    });
     ipcMain.handle('desktop:disable-floating-widget', async () => {
         updateDesktopPreferences({ floatingWidgetEnabled: false });
         return snapshot();
@@ -1681,11 +1838,27 @@ app.whenReady().then(async () => {
                 window.webContents.send('desktop:update-state-changed', state);
         }
     });
-    const lastConnectionUrl = readDesktopConfig().lastConnectionUrl;
-    if (lastConnectionUrl) {
-        const probe = await connectWindow(lastConnectionUrl);
-        if (!probe.ok)
-            await showConnectionCenter();
+    const startupConfig = readDesktopConfig();
+    const restoreUrls = startupConfig.openConnectionUrls;
+    let restoredWindowCount = 0;
+    for (const url of restoreUrls) {
+        const probe = await connectWindow(url, { focus: false, updateLastConnection: false });
+        if (probe.ok)
+            restoredWindowCount += 1;
+    }
+    if (restoredWindowCount > 0) {
+        let preferredOrigin = null;
+        try {
+            preferredOrigin = startupConfig.lastConnectionUrl
+                ? new URL(startupConfig.lastConnectionUrl).origin
+                : null;
+        }
+        catch {
+            // A malformed legacy value must not prevent the other saved windows
+            // from being restored.
+        }
+        const preferredWindow = preferredOrigin ? serviceWindows.get(preferredOrigin) : null;
+        showAndFocusWindow(preferredWindow ?? [...serviceWindows.values()][0]);
     }
     else {
         await showConnectionCenter();