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

Fix routing

Browse Source
This commit is contained in:
LukeGus
2025-07-28 15:50:50 -05:00
parent 1cab763bee
commit a92ed01129
1 changed files with 55 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
src/apps/SSH/ssh-axios.ts
View File

@@ -80,44 +80,49 @@ interface TunnelStatus {
retryExhausted?: boolean; retryExhausted?: boolean;
} }
interface ConfigEditorFile {
name: string;
path: string;
type?: 'file' | 'directory';
isSSH?: boolean;
sshSessionId?: string;
}
interface ConfigEditorShortcut {
name: string;
path: string;
}
const isLocalhost = window.location.hostname === 'localhost' || window.location.hostname === '127.0.0.1'; const isLocalhost = window.location.hostname === 'localhost' || window.location.hostname === '127.0.0.1';
const baseURL = isLocalhost ? 'http://localhost:8081' : window.location.origin;
const api = axios.create({ const sshHostApi = axios.create({
baseURL, baseURL: isLocalhost ? 'http://localhost:8081' : window.location.origin,
headers: {
'Content-Type': 'application/json',
},
});
const configEditorApi = axios.create({
baseURL: isLocalhost ? 'http://localhost:8084' : `${window.location.origin}/ssh`,
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
}, },
}); });
const tunnelApi = axios.create({ const tunnelApi = axios.create({
baseURL: isLocalhost ? 'http://localhost:8083' : window.location.origin,
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
}, },
}); });
const configEditorApi = axios.create({
baseURL: isLocalhost ? 'http://localhost:8084' : window.location.origin,
headers: {
'Content-Type': 'application/json',
}
})
function getCookie(name: string): string | undefined { function getCookie(name: string): string | undefined {
const value = `; ${document.cookie}`; const value = `; ${document.cookie}`;
const parts = value.split(`; ${name}=`); const parts = value.split(`; ${name}=`);
if (parts.length === 2) return parts.pop()?.split(';').shift(); if (parts.length === 2) return parts.pop()?.split(';').shift();
} }
api.interceptors.request.use((config) => { sshHostApi.interceptors.request.use((config) => {
const token = getCookie('jwt');
if (token) {
config.headers.Authorization = `Bearer ${token}`;
}
return config;
});
configEditorApi.interceptors.request.use((config) => {
const token = getCookie('jwt'); const token = getCookie('jwt');
if (token) { if (token) {
config.headers.Authorization = `Bearer ${token}`; config.headers.Authorization = `Bearer ${token}`;
@@ -133,9 +138,17 @@ tunnelApi.interceptors.request.use((config) => {
return config; return config;
}); });
configEditorApi.interceptors.request.use((config) => {
const token = getCookie('jwt');
if (token) {
config.headers.Authorization = `Bearer ${token}`;
}
return config;
});
export async function getSSHHosts(): Promise<SSHHost[]> { export async function getSSHHosts(): Promise<SSHHost[]> {
try { try {
const response = await api.get('/ssh/db/host'); const response = await sshHostApi.get('/ssh/db/host');
return response.data; return response.data;
} catch (error) { } catch (error) {
throw error; throw error;
@@ -180,7 +193,7 @@ export async function createSSHHost(hostData: SSHHostData): Promise<SSHHost> {
delete dataWithoutFile.key; delete dataWithoutFile.key;
formData.append('data', JSON.stringify(dataWithoutFile)); formData.append('data', JSON.stringify(dataWithoutFile));
const response = await api.post('/ssh/db/host', formData, { const response = await sshHostApi.post('/ssh/db/host', formData, {
headers: { headers: {
'Content-Type': 'multipart/form-data', 'Content-Type': 'multipart/form-data',
}, },
@@ -188,7 +201,7 @@ export async function createSSHHost(hostData: SSHHostData): Promise<SSHHost> {
return response.data; return response.data;
} else { } else {
const response = await api.post('/ssh/db/host', submitData); const response = await sshHostApi.post('/ssh/db/host', submitData);
return response.data; return response.data;
} }
} catch (error) { } catch (error) {
@@ -233,7 +246,7 @@ export async function updateSSHHost(hostId: number, hostData: SSHHostData): Prom
delete dataWithoutFile.key; delete dataWithoutFile.key;
formData.append('data', JSON.stringify(dataWithoutFile)); formData.append('data', JSON.stringify(dataWithoutFile));
const response = await api.put(`/ssh/db/host/${hostId}`, formData, { const response = await sshHostApi.put(`/ssh/db/host/${hostId}`, formData, {
headers: { headers: {
'Content-Type': 'multipart/form-data', 'Content-Type': 'multipart/form-data',
}, },
@@ -241,7 +254,7 @@ export async function updateSSHHost(hostId: number, hostData: SSHHostData): Prom
return response.data; return response.data;
} else { } else {
const response = await api.put(`/ssh/db/host/${hostId}`, submitData); const response = await sshHostApi.put(`/ssh/db/host/${hostId}`, submitData);
return response.data; return response.data;
} }
} catch (error) { } catch (error) {
@@ -251,7 +264,7 @@ export async function updateSSHHost(hostId: number, hostData: SSHHostData): Prom
export async function deleteSSHHost(hostId: number): Promise<any> { export async function deleteSSHHost(hostId: number): Promise<any> {
try { try {
const response = await api.delete(`/ssh/db/host/${hostId}`); const response = await sshHostApi.delete(`/ssh/db/host/${hostId}`);
return response.data; return response.data;
} catch (error) { } catch (error) {
throw error; throw error;
@@ -260,7 +273,7 @@ export async function deleteSSHHost(hostId: number): Promise<any> {
export async function getSSHHostById(hostId: number): Promise<SSHHost> { export async function getSSHHostById(hostId: number): Promise<SSHHost> {
try { try {
const response = await api.get(`/ssh/db/host/${hostId}`); const response = await sshHostApi.get(`/ssh/db/host/${hostId}`);
return response.data; return response.data;
} catch (error) { } catch (error) {
throw error; throw error;
@@ -269,8 +282,7 @@ export async function getSSHHostById(hostId: number): Promise<SSHHost> {
export async function getTunnelStatuses(): Promise<Record<string, TunnelStatus>> { export async function getTunnelStatuses(): Promise<Record<string, TunnelStatus>> {
try { try {
const tunnelUrl = isLocalhost ? 'http://localhost:8083/ssh/tunnel/status' : `${baseURL}/ssh_tunnel/status`; const response = await tunnelApi.get('/ssh/tunnel/status');
const response = await tunnelApi.get(tunnelUrl);
return response.data || {}; return response.data || {};
} catch (error) { } catch (error) {
throw error; throw error;
@@ -284,8 +296,7 @@ export async function getTunnelStatusByName(tunnelName: string): Promise<TunnelS
export async function connectTunnel(tunnelConfig: TunnelConfig): Promise<any> { export async function connectTunnel(tunnelConfig: TunnelConfig): Promise<any> {
try { try {
const tunnelUrl = isLocalhost ? 'http://localhost:8083/ssh/tunnel/connect' : `${baseURL}/ssh_tunnel/connect`; const response = await tunnelApi.post('/ssh/tunnel/connect', tunnelConfig);
const response = await tunnelApi.post(tunnelUrl, tunnelConfig);
return response.data; return response.data;
} catch (error) { } catch (error) {
throw error; throw error;
@@ -294,8 +305,7 @@ export async function connectTunnel(tunnelConfig: TunnelConfig): Promise<any> {
export async function disconnectTunnel(tunnelName: string): Promise<any> { export async function disconnectTunnel(tunnelName: string): Promise<any> {
try { try {
const tunnelUrl = isLocalhost ? 'http://localhost:8083/ssh/tunnel/disconnect' : `${baseURL}/ssh_tunnel/disconnect`; const response = await tunnelApi.post('/ssh/tunnel/disconnect', {tunnelName});
const response = await tunnelApi.post(tunnelUrl, {tunnelName});
return response.data; return response.data;
} catch (error) { } catch (error) {
throw error; throw error;
@@ -304,32 +314,16 @@ export async function disconnectTunnel(tunnelName: string): Promise<any> {
export async function cancelTunnel(tunnelName: string): Promise<any> { export async function cancelTunnel(tunnelName: string): Promise<any> {
try { try {
const tunnelUrl = isLocalhost ? 'http://localhost:8083/ssh/tunnel/cancel' : `${baseURL}/ssh_tunnel/cancel`; const response = await tunnelApi.post('/ssh/tunnel/cancel', {tunnelName});
const response = await tunnelApi.post(tunnelUrl, {tunnelName});
return response.data; return response.data;
} catch (error) { } catch (error) {
throw error; throw error;
} }
} }
export {api, configEditorApi};
interface ConfigEditorFile {
name: string;
path: string;
type?: 'file' | 'directory';
isSSH?: boolean;
sshSessionId?: string;
}
interface ConfigEditorShortcut {
name: string;
path: string;
}
export async function getConfigEditorRecent(hostId: number): Promise<ConfigEditorFile[]> { export async function getConfigEditorRecent(hostId: number): Promise<ConfigEditorFile[]> {
try { try {
const response = await api.get(`/ssh/config_editor/recent?hostId=${hostId}`); const response = await sshHostApi.get(`/ssh/config_editor/recent?hostId=${hostId}`);
return response.data || []; return response.data || [];
} catch (error) { } catch (error) {
return []; return [];
@@ -344,7 +338,7 @@ export async function addConfigEditorRecent(file: {
hostId: number hostId: number
}): Promise<any> { }): Promise<any> {
try { try {
const response = await api.post('/ssh/config_editor/recent', file); const response = await sshHostApi.post('/ssh/config_editor/recent', file);
return response.data; return response.data;
} catch (error) { } catch (error) {
throw error; throw error;
@@ -359,7 +353,7 @@ export async function removeConfigEditorRecent(file: {
hostId: number hostId: number
}): Promise<any> { }): Promise<any> {
try { try {
const response = await api.delete('/ssh/config_editor/recent', {data: file}); const response = await sshHostApi.delete('/ssh/config_editor/recent', {data: file});
return response.data; return response.data;
} catch (error) { } catch (error) {
throw error; throw error;
@@ -368,7 +362,7 @@ export async function removeConfigEditorRecent(file: {
export async function getConfigEditorPinned(hostId: number): Promise<ConfigEditorFile[]> { export async function getConfigEditorPinned(hostId: number): Promise<ConfigEditorFile[]> {
try { try {
const response = await api.get(`/ssh/config_editor/pinned?hostId=${hostId}`); const response = await sshHostApi.get(`/ssh/config_editor/pinned?hostId=${hostId}`);
return response.data || []; return response.data || [];
} catch (error) { } catch (error) {
return []; return [];
@@ -383,7 +377,7 @@ export async function addConfigEditorPinned(file: {
hostId: number hostId: number
}): Promise<any> { }): Promise<any> {
try { try {
const response = await api.post('/ssh/config_editor/pinned', file); const response = await sshHostApi.post('/ssh/config_editor/pinned', file);
return response.data; return response.data;
} catch (error) { } catch (error) {
throw error; throw error;
@@ -398,7 +392,7 @@ export async function removeConfigEditorPinned(file: {
hostId: number hostId: number
}): Promise<any> { }): Promise<any> {
try { try {
const response = await api.delete('/ssh/config_editor/pinned', {data: file}); const response = await sshHostApi.delete('/ssh/config_editor/pinned', {data: file});
return response.data; return response.data;
} catch (error) { } catch (error) {
throw error; throw error;
@@ -407,7 +401,7 @@ export async function removeConfigEditorPinned(file: {
export async function getConfigEditorShortcuts(hostId: number): Promise<ConfigEditorShortcut[]> { export async function getConfigEditorShortcuts(hostId: number): Promise<ConfigEditorShortcut[]> {
try { try {
const response = await api.get(`/ssh/config_editor/shortcuts?hostId=${hostId}`); const response = await sshHostApi.get(`/ssh/config_editor/shortcuts?hostId=${hostId}`);
return response.data || []; return response.data || [];
} catch (error) { } catch (error) {
return []; return [];
@@ -422,7 +416,7 @@ export async function addConfigEditorShortcut(shortcut: {
hostId: number hostId: number
}): Promise<any> { }): Promise<any> {
try { try {
const response = await api.post('/ssh/config_editor/shortcuts', shortcut); const response = await sshHostApi.post('/ssh/config_editor/shortcuts', shortcut);
return response.data; return response.data;
} catch (error) { } catch (error) {
throw error; throw error;
@@ -437,7 +431,7 @@ export async function removeConfigEditorShortcut(shortcut: {
hostId: number hostId: number
}): Promise<any> { }): Promise<any> {
try { try {
const response = await api.delete('/ssh/config_editor/shortcuts', {data: shortcut}); const response = await sshHostApi.delete('/ssh/config_editor/shortcuts', {data: shortcut});
return response.data; return response.data;
} catch (error) { } catch (error) {
throw error; throw error;
@@ -521,4 +515,6 @@ export async function writeSSHFile(sessionId: string, path: string, content: str
} catch (error) { } catch (error) {
throw error; throw error;
} }
} }
export {sshHostApi, tunnelApi, configEditorApi};