diff --git a/App.tsx b/App.tsx index 9586f3d7e..5995d0e18 100755 --- a/App.tsx +++ b/App.tsx @@ -403,6 +403,45 @@ function App({ settings }: { settings: SettingsState }) { }; }, [hosts, keys, portForwardingRules, setActiveTabId, startTunnel, stopTunnel, t]); + // Tray panel actions (from main process) + useEffect(() => { + const handlerJump = (_event: unknown, sessionId: string) => { + setActiveTabId(sessionId); + }; + + const handlerConnect = (_event: unknown, hostId: string) => { + const host = hosts.find((h) => h.id === hostId); + if (!host) { + toast.error(t("pf.error.hostNotFound")); + return; + } + + addConnectionLog({ + hostId: host.id, + hostLabel: host.label, + hostname: host.hostname, + username: host.username, + localHostname: "", + saved: false, + }); + + connectToHost(host); + }; + + window.electron?.ipcRenderer?.on?.("netcatty:trayPanel:jumpToSession", handlerJump); + window.electron?.ipcRenderer?.on?.("netcatty:trayPanel:connectToHost", handlerConnect); + return () => { + window.electron?.ipcRenderer?.removeListener?.( + "netcatty:trayPanel:jumpToSession", + handlerJump, + ); + window.electron?.ipcRenderer?.removeListener?.( + "netcatty:trayPanel:connectToHost", + handlerConnect, + ); + }; + }, [addConnectionLog, connectToHost, hosts, setActiveTabId, t]); + // Keyboard-interactive authentication (2FA/MFA) event listener useEffect(() => { const bridge = netcattyBridge.get(); diff --git a/application/state/useTrayPanelBackend.ts b/application/state/useTrayPanelBackend.ts index 3bfaba630..933131825 100644 --- a/application/state/useTrayPanelBackend.ts +++ b/application/state/useTrayPanelBackend.ts @@ -12,6 +12,16 @@ export const useTrayPanelBackend = () => { await bridge?.openMainWindow?.(); }, []); + const jumpToSession = useCallback(async (sessionId: string) => { + const bridge = netcattyBridge.get(); + await bridge?.jumpToSessionFromTrayPanel?.(sessionId); + }, []); + + const connectToHostFromTrayPanel = useCallback(async (hostId: string) => { + const bridge = netcattyBridge.get(); + await bridge?.connectToHostFromTrayPanel?.(hostId); + }, []); + const onTrayPanelCloseRequest = useCallback((callback: () => void) => { const bridge = netcattyBridge.get(); return bridge?.onTrayPanelCloseRequest?.(callback); @@ -47,6 +57,8 @@ export const useTrayPanelBackend = () => { return { hideTrayPanel, openMainWindow, + jumpToSession, + connectToHostFromTrayPanel, onTrayPanelCloseRequest, onTrayPanelRefresh, onTrayPanelMenuData, diff --git a/components/TrayPanel.tsx b/components/TrayPanel.tsx index 610aa3ae9..4827ad5bf 100644 --- a/components/TrayPanel.tsx +++ b/components/TrayPanel.tsx @@ -37,10 +37,18 @@ const StatusDot: React.FC<{ status: "success" | "warning" | "error" | "neutral"; const TrayPanelContent: React.FC = () => { const { t } = useI18n(); - const { hideTrayPanel, openMainWindow, onTrayPanelCloseRequest, onTrayPanelRefresh, onTrayPanelMenuData } = useTrayPanelBackend(); + const { + hideTrayPanel, + openMainWindow, + jumpToSession, + connectToHostFromTrayPanel, + onTrayPanelCloseRequest, + onTrayPanelRefresh, + onTrayPanelMenuData, + } = useTrayPanelBackend(); const { hosts, keys } = useVaultState(); - const { setActiveTabId, connectToHost } = useSessionState(); + useSessionState(); const { rules: portForwardingRules, startTunnel, stopTunnel } = usePortForwardingState(); const activeTabId = useActiveTabId(); @@ -160,8 +168,7 @@ const TrayPanelContent: React.FC = () => { key={s.id} title={s.hostLabel || s.label} onClick={() => { - setActiveTabId(s.id); - void openMainWindow(); + void jumpToSession(s.id); }} className={cn( "w-full text-left px-2 py-1.5 rounded hover:bg-muted", @@ -194,10 +201,7 @@ const TrayPanelContent: React.FC = () => { className="w-full justify-start px-2 h-8" title={rh.label} onClick={() => { - const host = hosts.find((h) => h.id === rh.hostId); - if (!host) return; - connectToHost(host); - void openMainWindow(); + void connectToHostFromTrayPanel(rh.hostId); }} > {rh.label} diff --git a/electron/bridges/globalShortcutBridge.cjs b/electron/bridges/globalShortcutBridge.cjs index 495237e2b..c074662aa 100644 --- a/electron/bridges/globalShortcutBridge.cjs +++ b/electron/bridges/globalShortcutBridge.cjs @@ -661,6 +661,28 @@ function registerHandlers(ipcMain) { return { success: true }; }); + ipcMain.handle("netcatty:trayPanel:jumpToSession", async (_event, sessionId) => { + openMainWindow(); + try { + const win = getMainWindow(); + win?.webContents?.send("netcatty:trayPanel:jumpToSession", sessionId); + } catch { + // ignore + } + return { success: true }; + }); + + ipcMain.handle("netcatty:trayPanel:connectToHost", async (_event, hostId) => { + openMainWindow(); + try { + const win = getMainWindow(); + win?.webContents?.send("netcatty:trayPanel:connectToHost", hostId); + } catch { + // ignore + } + return { success: true }; + }); + console.log("[GlobalShortcut] IPC handlers registered"); } diff --git a/electron/preload.cjs b/electron/preload.cjs index 17fa43d1c..0457ea8c6 100644 --- a/electron/preload.cjs +++ b/electron/preload.cjs @@ -782,6 +782,10 @@ const api = { // Tray panel window hideTrayPanel: () => ipcRenderer.invoke("netcatty:trayPanel:hide"), openMainWindow: () => ipcRenderer.invoke("netcatty:trayPanel:openMainWindow"), + jumpToSessionFromTrayPanel: (sessionId) => + ipcRenderer.invoke("netcatty:trayPanel:jumpToSession", sessionId), + connectToHostFromTrayPanel: (hostId) => + ipcRenderer.invoke("netcatty:trayPanel:connectToHost", hostId), onTrayPanelCloseRequest: (callback) => { const handler = () => callback(); ipcRenderer.on("netcatty:trayPanel:closeRequest", handler); diff --git a/global.d.ts b/global.d.ts index cec524a81..04f0c0d58 100644 --- a/global.d.ts +++ b/global.d.ts @@ -606,6 +606,8 @@ declare global { hideTrayPanel?(): Promise<{ success: boolean }>; openMainWindow?(): Promise<{ success: boolean }>; + jumpToSessionFromTrayPanel?(sessionId: string): Promise<{ success: boolean }>; + connectToHostFromTrayPanel?(hostId: string): Promise<{ success: boolean }>; onTrayPanelCloseRequest?(callback: () => void): () => void; onTrayPanelRefresh?(callback: () => void): () => void; onTrayPanelMenuData?(callback: (data: {