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

fix: Tunnels being same name

Browse Source
This commit is contained in:
LukeGus
2025-11-02 16:14:31 -06:00
parent 73d06cb6af
commit 5dae1feca8
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1409,7 +1409,11 @@ async function initializeAutoStartTunnels(): Promise<void> {
if (endpointHost) {
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}`,
sourceIP: host.ip,
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,
) => {
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 }));

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

@@ -34,7 +34,9 @@ export function TunnelObject({
const getTunnelStatus = (tunnelIndex: number): TunnelStatus | undefined => {
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];
};
@@ -119,7 +121,9 @@ export function TunnelObject({
{host.tunnelConnections.map((tunnel, tunnelIndex) => {
const status = getTunnelStatus(tunnelIndex);
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 statusValue =
status?.status?.toUpperCase() || "DISCONNECTED";
@@ -352,7 +356,9 @@ export function TunnelObject({
{host.tunnelConnections.map((tunnel, tunnelIndex) => {
const status = getTunnelStatus(tunnelIndex);
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 statusValue =
status?.status?.toUpperCase() || "DISCONNECTED";