diff --git a/docker/nginx.conf b/docker/nginx.conf index bc653d98..f40f55ae 100644 --- a/docker/nginx.conf +++ b/docker/nginx.conf @@ -18,20 +18,7 @@ http { index index.html index.htm; } - location /database.io/ { - proxy_pass http://127.0.0.1:8081; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_set_header Host $host; - proxy_cache_bypass $http_upgrade; - - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } - - location /ssh.io/ { + location /ssh/websocket { proxy_pass http://127.0.0.1:8082; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; @@ -44,7 +31,7 @@ http { proxy_set_header X-Forwarded-Proto $scheme; } - location /rdp.io/ { + location /ssh_tunnel/websocket { proxy_pass http://127.0.0.1:8083; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; @@ -57,7 +44,7 @@ http { proxy_set_header X-Forwarded-Proto $scheme; } - location /vnc.io/ { + location /config_editor/websocket { proxy_pass http://127.0.0.1:8084; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; @@ -70,19 +57,6 @@ http { proxy_set_header X-Forwarded-Proto $scheme; } - location /sftp.io/ { - proxy_pass http://127.0.0.1:8085; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_set_header Host $host; - proxy_cache_bypass $http_upgrade; - - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } - error_page 500 502 503 504 /50x.html; location = /50x.html { root /usr/share/nginx/html; diff --git a/src/apps/SSH/Manager/SSHManagerHostEditor.tsx b/src/apps/SSH/Manager/SSHManagerHostEditor.tsx index 97f43874..904daf19 100644 --- a/src/apps/SSH/Manager/SSHManagerHostEditor.tsx +++ b/src/apps/SSH/Manager/SSHManagerHostEditor.tsx @@ -30,7 +30,7 @@ interface SSHHost { folder: string; tags: string[]; pin: boolean; - authType: 'password' | 'key'; + authType: string; password?: string; key?: string; keyPassword?: string; @@ -171,7 +171,7 @@ export function SSHManagerHostEditor({ editingHost, onFormSubmit }: SSHManagerHo type FormData = z.infer; const form = useForm({ - resolver: zodResolver(formSchema), + resolver: zodResolver(formSchema) as any, defaultValues: { name: editingHost?.name || "", ip: editingHost?.ip || "", diff --git a/src/apps/SSH/Terminal/SSHTerminal.tsx b/src/apps/SSH/Terminal/SSHTerminal.tsx index c8c60414..e2d48944 100644 --- a/src/apps/SSH/Terminal/SSHTerminal.tsx +++ b/src/apps/SSH/Terminal/SSHTerminal.tsx @@ -99,7 +99,12 @@ export const SSHTerminal = forwardRef(function SSHTermina const cols = terminal.cols + 1; const rows = terminal.rows; - const ws = new WebSocket('ws://localhost:8082'); + const wsUrl = window.location.hostname === 'localhost' + ? 'ws://localhost:8082' + : `${window.location.protocol === 'https:' ? 'wss' : 'ws'}://${window.location.host}/ssh/websocket/`; + + const ws = new WebSocket(wsUrl); + webSocketRef.current = ws; ws.addEventListener('open', () => { diff --git a/src/backend/databasae/routes/config_editor.ts b/src/backend/databasae/routes/config_editor.ts deleted file mode 100644 index 0519ecba..00000000 --- a/src/backend/databasae/routes/config_editor.ts +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/backend/database/database.ts b/src/backend/database/database.ts index b3ea03eb..c7f7ab7a 100644 --- a/src/backend/database/database.ts +++ b/src/backend/database/database.ts @@ -53,9 +53,4 @@ app.use((err: unknown, req: express.Request, res: express.Response, next: expres }); const PORT = 8081; -app.listen(PORT, () => { - logger.success(`Database server started on port ${PORT}`); -}).on('error', (err) => { - logger.error(`Failed to start database server:`, err); - process.exit(1); -}); \ No newline at end of file +app.listen(PORT, () => {}); \ No newline at end of file