feat(terminal-connection): enhance terminal connection handling with auto-connect feature and improved status messaging
This commit is contained in:
Andras Bacsai
@@ -42,7 +42,7 @@ export function initializeTerminalComponent() {
|
||||
this.setupTerminalEventListeners();
|
||||
|
||||
this.$wire.on('send-back-command', (command) => {
|
||||
this.sendMessage({ command: command });
|
||||
this.sendCommandWhenReady({ command: command });
|
||||
});
|
||||
|
||||
this.keepAliveInterval = setInterval(this.keepAlive.bind(this), 30000);
|
||||
@@ -99,6 +99,9 @@ export function initializeTerminalComponent() {
|
||||
this.paused = false;
|
||||
this.commandBuffer = '';
|
||||
|
||||
// Notify parent component that terminal disconnected
|
||||
this.$wire.dispatch('terminalDisconnected');
|
||||
|
||||
// Force a refresh
|
||||
this.$nextTick(() => {
|
||||
this.resizeTerminal();
|
||||
@@ -205,6 +208,9 @@ export function initializeTerminalComponent() {
|
||||
|
||||
// Start ping timeout monitoring
|
||||
this.resetPingTimeout();
|
||||
|
||||
// Notify that WebSocket is ready for auto-connection
|
||||
this.dispatchEvent('terminal-websocket-ready');
|
||||
},
|
||||
|
||||
handleSocketError(error) {
|
||||
@@ -277,6 +283,12 @@ export function initializeTerminalComponent() {
|
||||
}
|
||||
},
|
||||
|
||||
sendCommandWhenReady(message) {
|
||||
if (this.isWebSocketReady()) {
|
||||
this.sendMessage(message);
|
||||
}
|
||||
},
|
||||
|
||||
handleSocketMessage(event) {
|
||||
// Handle pong responses
|
||||
if (event.data === 'pong') {
|
||||
@@ -297,14 +309,23 @@ export function initializeTerminalComponent() {
|
||||
this.term.focus();
|
||||
document.querySelector('.xterm-viewport').classList.add('scrollbar', 'rounded-sm');
|
||||
this.resizeTerminal();
|
||||
|
||||
// Notify parent component that terminal is connected
|
||||
this.$wire.dispatch('terminalConnected');
|
||||
} else if (event.data === 'unprocessable') {
|
||||
if (this.term) this.term.reset();
|
||||
this.terminalActive = false;
|
||||
this.message = '(sorry, something went wrong, please try again)';
|
||||
|
||||
// Notify parent component that terminal connection failed
|
||||
this.$wire.dispatch('terminalDisconnected');
|
||||
} else if (event.data === 'pty-exited') {
|
||||
this.terminalActive = false;
|
||||
this.term.reset();
|
||||
this.commandBuffer = '';
|
||||
|
||||
// Notify parent component that terminal disconnected
|
||||
this.$wire.dispatch('terminalDisconnected');
|
||||
} else {
|
||||
try {
|
||||
this.pendingWrites++;
|
||||
@@ -441,6 +462,22 @@ export function initializeTerminalComponent() {
|
||||
lastPingTime: this.lastPingTime,
|
||||
heartbeatMissed: this.heartbeatMissed
|
||||
};
|
||||
},
|
||||
|
||||
// Helper method to dispatch custom events
|
||||
dispatchEvent(eventName, detail = null) {
|
||||
const event = new CustomEvent(eventName, {
|
||||
detail: detail,
|
||||
bubbles: true
|
||||
});
|
||||
this.$el.dispatchEvent(event);
|
||||
},
|
||||
|
||||
// Check if WebSocket is ready for commands
|
||||
isWebSocketReady() {
|
||||
return this.connectionState === 'connected' &&
|
||||
this.socket &&
|
||||
this.socket.readyState === WebSocket.OPEN;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
<livewire:server.navbar :server="$server" :parameters="$parameters" />
|
||||
@endif
|
||||
|
||||
<h2 class="pb-4">Terminal</h2>
|
||||
@if (!$hasShell)
|
||||
<div class="flex items-center justify-center w-full py-4 mx-auto">
|
||||
<div class="p-4 w-full rounded-sm border dark:bg-coolgray-100 dark:border-coolgray-300">
|
||||
@@ -37,10 +36,19 @@
|
||||
@else
|
||||
@if ($type === 'server')
|
||||
@if ($server->isTerminalEnabled())
|
||||
<form class="w-full" wire:submit="$dispatchSelf('connectToServer')"
|
||||
wire:init="$dispatchSelf('connectToServer')">
|
||||
<x-forms.button class="w-full" type="submit">Reconnect</x-forms.button>
|
||||
<form class="w-full flex gap-2 items-start justify-start"
|
||||
wire:submit="$dispatchSelf('connectToServer')">
|
||||
<h2 class="pb-4">Terminal</h2>
|
||||
<x-forms.button type="submit" :disabled="$isConnecting">
|
||||
Reconnect
|
||||
</x-forms.button>
|
||||
</form>
|
||||
|
||||
{{-- Loading indicator for all connection states --}}
|
||||
@if (!$containersLoaded || $isConnecting || $connectionStatus)
|
||||
<span class="text-sm">{{ $connectionStatus }}</span>
|
||||
@endif
|
||||
|
||||
<div class="mx-auto w-full">
|
||||
<livewire:project.shared.terminal />
|
||||
</div>
|
||||
@@ -52,10 +60,18 @@
|
||||
<div class="pt-4">No containers are running on this server or terminal access is disabled.</div>
|
||||
@else
|
||||
@if (count($containers) === 1)
|
||||
<form class="w-full pt-4" wire:submit="$dispatchSelf('connectToContainer')"
|
||||
wire:init="$dispatchSelf('connectToContainer')">
|
||||
<x-forms.button class="w-full" type="submit">Reconnect</x-forms.button>
|
||||
<form class="w-full flex gap-2 items-start justify-start pt-4"
|
||||
wire:submit="$dispatchSelf('connectToContainer')">
|
||||
<h2 class="pb-4">Terminal</h2>
|
||||
<x-forms.button type="submit" :disabled="$isConnecting">
|
||||
Reconnect
|
||||
</x-forms.button>
|
||||
</form>
|
||||
|
||||
{{-- Loading indicator for all connection states --}}
|
||||
@if (!$containersLoaded || $isConnecting || $connectionStatus)
|
||||
<span class="text-sm">{{ $connectionStatus }}</span>
|
||||
@endif
|
||||
@else
|
||||
<form class="w-full pt-4 flex gap-2 flex-col" wire:submit="$dispatchSelf('connectToContainer')">
|
||||
<x-forms.select label="Container" id="container" required wire:model="selected_container">
|
||||
@@ -69,8 +85,15 @@
|
||||
</option>
|
||||
@endforeach
|
||||
</x-forms.select>
|
||||
<x-forms.button class="w-full" type="submit">Connect</x-forms.button>
|
||||
<x-forms.button class="w-full" type="submit" :disabled="$isConnecting">
|
||||
{{ $isConnecting ? 'Connecting...' : 'Connect' }}
|
||||
</x-forms.button>
|
||||
</form>
|
||||
|
||||
{{-- Loading indicator for manual connection --}}
|
||||
@if ($isConnecting || $connectionStatus)
|
||||
<span class="text-sm">{{ $connectionStatus }}</span>
|
||||
@endif
|
||||
@endif
|
||||
<div class="mx-auto w-full">
|
||||
<livewire:project.shared.terminal />
|
||||
@@ -78,4 +101,41 @@
|
||||
@endif
|
||||
@endif
|
||||
@endif
|
||||
|
||||
@script
|
||||
<script>
|
||||
let autoConnectionAttempted = false;
|
||||
|
||||
// Wait for terminal WebSocket to be ready before attempting auto-connection
|
||||
function tryAutoConnection() {
|
||||
if (autoConnectionAttempted) return;
|
||||
|
||||
const terminalContainer = document.getElementById('terminal-container');
|
||||
if (!terminalContainer) return;
|
||||
|
||||
// Check if Alpine component is initialized and WebSocket is ready
|
||||
if (terminalContainer._x_dataStack &&
|
||||
terminalContainer._x_dataStack[0] &&
|
||||
terminalContainer._x_dataStack[0].isWebSocketReady()) {
|
||||
|
||||
autoConnectionAttempted = true;
|
||||
$wire.dispatchSelf('initializeTerminalConnection');
|
||||
}
|
||||
}
|
||||
|
||||
// Listen for terminal WebSocket ready event
|
||||
document.addEventListener('terminal-websocket-ready', tryAutoConnection);
|
||||
|
||||
// Fallback polling in case event is missed
|
||||
function pollForTerminalReady() {
|
||||
if (!autoConnectionAttempted) {
|
||||
tryAutoConnection();
|
||||
setTimeout(pollForTerminalReady, 300);
|
||||
}
|
||||
}
|
||||
|
||||
// Start polling after a short delay to allow Alpine to initialize
|
||||
setTimeout(pollForTerminalReady, 200);
|
||||
</script>
|
||||
@endscript
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user