dennii/Termix
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 22 Wiki Activity

v1.8.0 #429

Merged
LukeGus merged 198 commits from dev-1.8.0 into main 2025-11-05 16:36:16 +00:00
Conversation 0 Commits 198 Files Changed 196 +17 -5
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5dae1feca8 - Show all commits

6
src/backend/ssh/tunnel.ts
View File

@@ -1409,7 +1409,11 @@ async function initializeAutoStartTunnels(): Promise<void> {
if (endpointHost) { if (endpointHost) {
const tunnelConfig: TunnelConfig = { const tunnelConfig: TunnelConfig = {
name: `${host.name || `${host.username}@${host.ip}`}_${tunnelConnection.sourcePort}_${tunnelConnection.endpointPort}`, name: `${host.name || `${host.username}@${host.ip}`}_${
tunnelConnection.sourcePort
}_${tunnelConnection.endpointHost}_${
tunnelConnection.endpointPort
}`,
hostName: host.name || `${host.username}@${host.ip}`, hostName: host.name || `${host.username}@${host.ip}`,
sourceIP: host.ip, sourceIP: host.ip,
sourceSSHPort: host.port, sourceSSHPort: host.port,

4
src/ui/desktop/apps/tunnel/Tunnel.tsx
View File

@@ -126,7 +126,9 @@ export function Tunnel({ filterHostKey }: SSHTunnelProps): React.ReactElement {
tunnelIndex: number, tunnelIndex: number,
) => { ) => {
const tunnel = host.tunnelConnections[tunnelIndex]; const tunnel = host.tunnelConnections[tunnelIndex];
const tunnelName = `${host.name || `${host.username}@${host.ip}`}_${tunnel.sourcePort}_${tunnel.endpointPort}`; const tunnelName = `${host.name || `${host.username}@${host.ip}`}_${
tunnel.sourcePort
}_${tunnel.endpointHost}_${tunnel.endpointPort}`;
setTunnelActions((prev) => ({ ...prev, [tunnelName]: true })); setTunnelActions((prev) => ({ ...prev, [tunnelName]: true }));

12
src/ui/desktop/apps/tunnel/TunnelObject.tsx
View File

@@ -34,7 +34,9 @@ export function TunnelObject({
const getTunnelStatus = (tunnelIndex: number): TunnelStatus | undefined => { const getTunnelStatus = (tunnelIndex: number): TunnelStatus | undefined => {
const tunnel = host.tunnelConnections[tunnelIndex]; const tunnel = host.tunnelConnections[tunnelIndex];
const tunnelName = `${host.name || `${host.username}@${host.ip}`}_${tunnel.sourcePort}_${tunnel.endpointPort}`; const tunnelName = `${host.name || `${host.username}@${host.ip}`}_${
tunnel.sourcePort
}_${tunnel.endpointHost}_${tunnel.endpointPort}`;
return tunnelStatuses[tunnelName]; return tunnelStatuses[tunnelName];
}; };
@@ -119,7 +121,9 @@ export function TunnelObject({
{host.tunnelConnections.map((tunnel, tunnelIndex) => { {host.tunnelConnections.map((tunnel, tunnelIndex) => {
const status = getTunnelStatus(tunnelIndex); const status = getTunnelStatus(tunnelIndex);
const statusDisplay = getTunnelStatusDisplay(status); const statusDisplay = getTunnelStatusDisplay(status);
const tunnelName = `${host.name || `${host.username}@${host.ip}`}_${tunnel.sourcePort}_${tunnel.endpointPort}`; const tunnelName = `${host.name || `${host.username}@${host.ip}`}_${
tunnel.sourcePort
}_${tunnel.endpointHost}_${tunnel.endpointPort}`;
const isActionLoading = tunnelActions[tunnelName]; const isActionLoading = tunnelActions[tunnelName];
const statusValue = const statusValue =
status?.status?.toUpperCase() || "DISCONNECTED"; status?.status?.toUpperCase() || "DISCONNECTED";
@@ -352,7 +356,9 @@ export function TunnelObject({
{host.tunnelConnections.map((tunnel, tunnelIndex) => { {host.tunnelConnections.map((tunnel, tunnelIndex) => {
const status = getTunnelStatus(tunnelIndex); const status = getTunnelStatus(tunnelIndex);
const statusDisplay = getTunnelStatusDisplay(status); const statusDisplay = getTunnelStatusDisplay(status);
const tunnelName = `${host.name || `${host.username}@${host.ip}`}_${tunnel.sourcePort}_${tunnel.endpointPort}`; const tunnelName = `${host.name || `${host.username}@${host.ip}`}_${
tunnel.sourcePort
}_${tunnel.endpointHost}_${tunnel.endpointPort}`;
const isActionLoading = tunnelActions[tunnelName]; const isActionLoading = tunnelActions[tunnelName];
const statusValue = const statusValue =
status?.status?.toUpperCase() || "DISCONNECTED"; status?.status?.toUpperCase() || "DISCONNECTED";