dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

feat(terminal-connection): enhance terminal connection handling with auto-connect feature and improved status messaging

Browse Source
This commit is contained in:
Andras Bacsai
2025-06-06 21:15:50 +02:00
parent 1cdc01194b
commit ba970d909c
3 changed files with 174 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
app/Livewire/Project/Shared/ExecuteContainerCommand.php
View File

@@ -29,6 +29,16 @@ class ExecuteContainerCommand extends Component
public bool $hasShell = true;
public bool $containersLoaded = false;
public bool $autoConnectAttempted = false;
public bool $isConnecting = false;
public bool $isConnected = false;
public string $connectionStatus = 'Loading containers...';
protected $rules = [
'server' => 'required',
'container' => 'required',
@@ -87,6 +97,8 @@ class ExecuteContainerCommand extends Component
$this->type = 'server';
$this->resource = Server::ownedByCurrentTeam()->whereUuid($this->parameters['server_uuid'])->firstOrFail();
$this->server = $this->resource;
$this->containersLoaded = true; // Server doesn't need container loading
$this->connectionStatus = 'Waiting for terminal to be ready...';
}
}
@@ -151,6 +163,49 @@ class ExecuteContainerCommand extends Component
if ($this->containers->count() === 1) {
$this->selected_container = data_get($this->containers->first(), 'container.Names');
}
$this->containersLoaded = true;
$this->connectionStatus = 'Waiting for terminal to be ready...';
}
#[On('initializeTerminalConnection')]
public function initializeTerminalConnection()
{
// Only auto-connect if containers are loaded and we haven't attempted before
if (! $this->containersLoaded || $this->autoConnectAttempted) {
return;
}
$this->autoConnectAttempted = true;
$this->isConnecting = true;
if ($this->type === 'server') {
$this->connectionStatus = 'Establishing connection to server terminal...';
$this->connectToServer();
} elseif ($this->containers->count() === 1) {
$this->connectionStatus = 'Establishing connection to container terminal...';
$this->connectToContainer();
} else {
$this->isConnecting = false;
$this->connectionStatus = '';
}
}
#[On('terminalConnected')]
public function terminalConnected()
{
$this->isConnected = true;
$this->isConnecting = false;
$this->connectionStatus = '';
}
#[On('terminalDisconnected')]
public function terminalDisconnected()
{
$this->isConnected = false;
$this->isConnecting = false;
$this->autoConnectAttempted = false;
$this->connectionStatus = 'Connection lost. Click Reconnect to try again.';
}
private function checkShellAvailability(Server $server, string $container): bool
@@ -179,6 +234,8 @@ class ExecuteContainerCommand extends Component
throw new \RuntimeException('Terminal access is disabled on this server.');
}
$this->hasShell = true;
$this->isConnecting = true;
$this->connectionStatus = 'Establishing connection to server terminal...';
$this->dispatch(
'send-terminal-command',
false,
@@ -186,6 +243,9 @@ class ExecuteContainerCommand extends Component
data_get($this->server, 'uuid')
);
} catch (\Throwable $e) {
$this->isConnecting = false;
$this->connectionStatus = 'Connection failed.';
return handleError($e, $this);
}
}
@@ -234,9 +294,14 @@ class ExecuteContainerCommand extends Component
$this->hasShell = $this->checkShellAvailability($server, data_get($container, 'container.Names'));
if (! $this->hasShell) {
$this->isConnecting = false;
$this->connectionStatus = 'Shell not available in container.';
return;
}
$this->isConnecting = true;
$this->connectionStatus = 'Establishing connection to container terminal...';
$this->dispatch(
'send-terminal-command',
true,
@@ -244,6 +309,9 @@ class ExecuteContainerCommand extends Component
data_get($container, 'server.uuid')
);
} catch (\Throwable $e) {
$this->isConnecting = false;
$this->connectionStatus = 'Connection failed.';
return handleError($e, $this);
}
}