fix: server validation with cf tunnels

This commit is contained in:
Andras Bacsai 2023-09-24 10:48:54 +02:00
parent db3148c080
commit 92a53a151e
5 changed files with 29 additions and 27 deletions

View File

@ -45,6 +45,8 @@ class Form extends Component
$this->cleanup_after_percentage = $this->server->settings->cleanup_after_percentage;
}
public function instantSave() {
refresh_server_connection($this->server->privateKey);
$this->validateServer();
$this->server->settings->save();
}
public function installDocker()
@ -62,21 +64,19 @@ class Form extends Component
$this->uptime = $uptime;
$this->emit('success', 'Server is reachable.');
} else {
ray($this->uptime);
$this->emit('error', 'Server is not reachable.');
return;
}
if ($dockerVersion) {
$this->dockerVersion = $dockerVersion;
$this->emit('proxyStatusUpdated');
$this->emit('success', 'Docker Engine 23+ is installed!');
} else {
$this->emit('error', 'No Docker Engine or older than 23 version installed.');
}
} catch (\Throwable $e) {
return handleError($e, $this, customErrorMessage: "Server is not reachable: ");
} finally {
$this->emit('proxyStatusUpdated');
}
}

View File

@ -2,9 +2,7 @@
<livewire:server.proxy.modal :server="$server" />
<div class="flex items-center gap-2">
<h1>Server</h1>
@if ($server->settings->is_reachable)
<livewire:server.proxy.status :server="$server" />
@endif
</div>
<div class="subtitle ">{{ data_get($server, 'name') }}</div>
<nav class="navbar-main">

View File

@ -23,7 +23,7 @@
@if (!$server->isFunctional())
You can't use this server until it is validated.
@else
Server validated.
Server is reachable and validated.
@endif
<div class="flex flex-col gap-2 pt-4">
<div class="flex flex-col w-full gap-2 lg:flex-row">

View File

@ -7,7 +7,7 @@
</p>
</x-slot:modalBody>
</x-modal>
@if (is_null(data_get($server, 'proxy.type')) || data_get($server, 'proxy.type') !== 'NONE')
@if ($server->isFunctional() && data_get($server, 'proxy.type') !== 'NONE')
@if (data_get($server, 'proxy.status') !== 'exited')
<div class="flex gap-4">
<button>

View File

@ -1,3 +1,5 @@
<div>
@if ($server->isFunctional())
<div class="flex gap-2" x-init="$wire.getProxyStatus">
@if ($server->proxy->status === 'running')
<x-status.running text="Proxy Running" />
@ -17,3 +19,5 @@
</g>
</svg></button>
</div>
@endif
</div>