diff --git a/app/Actions/Proxy/CheckConfiguration.php b/app/Actions/Proxy/CheckConfiguration.php index bdeafd061..b2d1eb787 100644 --- a/app/Actions/Proxy/CheckConfiguration.php +++ b/app/Actions/Proxy/CheckConfiguration.php @@ -3,6 +3,7 @@ namespace App\Actions\Proxy; use App\Models\Server; +use App\Services\ProxyDashboardCacheService; use Lorisleiva\Actions\Concerns\AsAction; class CheckConfiguration @@ -28,6 +29,8 @@ class CheckConfiguration throw new \Exception('Could not generate proxy configuration'); } + ProxyDashboardCacheService::isTraefikDashboardAvailableFromConfiguration($server, $proxy_configuration); + return $proxy_configuration; } } diff --git a/app/Actions/Proxy/CheckProxy.php b/app/Actions/Proxy/CheckProxy.php index 895bed410..d4b03ffc1 100644 --- a/app/Actions/Proxy/CheckProxy.php +++ b/app/Actions/Proxy/CheckProxy.php @@ -3,9 +3,9 @@ namespace App\Actions\Proxy; use App\Enums\ProxyTypes; -use App\Events\ProxyStatusChanged; use App\Models\Server; use Illuminate\Support\Facades\Log; +use Illuminate\Support\Facades\Process; use Lorisleiva\Actions\Concerns\AsAction; use Symfony\Component\Yaml\Yaml; @@ -13,38 +13,12 @@ class CheckProxy { use AsAction; - /** - * Determine if the proxy should be started - * - * @param bool $fromUI Whether this check is initiated from the UI - * @return bool True if proxy should be started, false otherwise - */ - public function handle(Server $server, bool $fromUI = false): bool + // It should return if the proxy should be started (true) or not (false) + public function handle(Server $server, $fromUI = false): bool { - // Early validation checks - if (! $this->shouldProxyRun($server, $fromUI)) { - return false; - } - - // Handle swarm vs standalone differently - if ($server->isSwarm()) { - return $this->checkSwarmProxy($server); - } - - return $this->checkStandaloneProxy($server, $fromUI); - } - - /** - * Basic validation to determine if proxy can run at all - */ - private function shouldProxyRun(Server $server, bool $fromUI): bool - { - // Server must be functional if (! $server->isFunctional()) { return false; } - - // Build servers don't need proxy if ($server->isBuildServer()) { if ($server->proxy) { $server->proxy = null; @@ -53,308 +27,255 @@ class CheckProxy return false; } - $proxyType = $server->proxyType(); - - // Check if proxy is disabled or force stopped if ((is_null($proxyType) || $proxyType === 'NONE' || $server->proxy->force_stop) && ! $fromUI) { return false; } - - // Validate proxy configuration if (! $server->isProxyShouldRun()) { if ($fromUI) { throw new \Exception('Proxy should not run. You selected the Custom Proxy.'); + } else { + return false; } - - return false; } - return true; - } + // Determine proxy container name based on environment + $proxyContainerName = $server->isSwarm() ? 'coolify-proxy_traefik' : 'coolify-proxy'; - /** - * Check proxy status for swarm mode - */ - private function checkSwarmProxy(Server $server): bool - { - $proxyContainerName = 'coolify-proxy_traefik'; - $status = getContainerStatus($server, $proxyContainerName); - - // Update status if changed - if ($server->proxy->status !== $status) { + if ($server->isSwarm()) { + $status = getContainerStatus($server, $proxyContainerName); $server->proxy->set('status', $status); $server->save(); - } - - // If running, no need to start - return $status !== 'running'; - } - - /** - * Check proxy status for standalone mode - */ - private function checkStandaloneProxy(Server $server, bool $fromUI): bool - { - $proxyContainerName = 'coolify-proxy'; - $status = getContainerStatus($server, $proxyContainerName); - - if ($server->proxy->status !== $status) { - $server->proxy->set('status', $status); - $server->save(); - ProxyStatusChanged::dispatch($server->id); - } - - // If already running, no need to start - if ($status === 'running') { - return false; - } - - // Cloudflare tunnel doesn't need proxy - if ($server->settings->is_cloudflare_tunnel) { - return false; - } - - // Check for port conflicts - $portsToCheck = $this->getPortsToCheck($server); - - if (empty($portsToCheck)) { - return false; - } - - $this->validatePortsAvailable($server, $portsToCheck, $proxyContainerName, $fromUI); - - return true; - } - - /** - * Get list of ports that need to be available for the proxy - */ - private function getPortsToCheck(Server $server): array - { - $defaultPorts = ['80', '443']; - - try { - if ($server->proxyType() === ProxyTypes::NONE->value) { - return []; + if ($status === 'running') { + return false; } - $proxyCompose = CheckConfiguration::run($server); - if (! $proxyCompose) { - return $defaultPorts; + return true; + } else { + $status = getContainerStatus($server, $proxyContainerName); + if ($status === 'running') { + $server->proxy->set('status', 'running'); + $server->save(); + + return false; } - - $yaml = Yaml::parse($proxyCompose); - $ports = $this->extractPortsFromCompose($yaml, $server->proxyType()); - - return ! empty($ports) ? $ports : $defaultPorts; - - } catch (\Exception $e) { - Log::error('Error checking proxy configuration: '.$e->getMessage()); - - return $defaultPorts; - } - } - - /** - * Extract ports from docker-compose configuration - */ - private function extractPortsFromCompose(array $yaml, string $proxyType): array - { - $ports = []; - $servicePorts = null; - - if ($proxyType === ProxyTypes::TRAEFIK->value) { - $servicePorts = data_get($yaml, 'services.traefik.ports'); - } elseif ($proxyType === ProxyTypes::CADDY->value) { - $servicePorts = data_get($yaml, 'services.caddy.ports'); - } - - if ($servicePorts) { - foreach ($servicePorts as $port) { - $ports[] = str($port)->before(':')->value(); + if ($server->settings->is_cloudflare_tunnel) { + return false; } - } - - return array_unique($ports); - } - - /** - * Validate that required ports are available (checked in parallel) - */ - private function validatePortsAvailable(Server $server, array $ports, string $proxyContainerName, bool $fromUI): void - { - if (empty($ports)) { - return; - } - - \Log::info('Checking ports in parallel: '.implode(', ', $ports)); - - // Check all ports in parallel - $conflicts = $this->checkPortsInParallel($server, $ports, $proxyContainerName); - - // Handle any conflicts found - foreach ($conflicts as $port) { - $message = "Port $port is in use"; - if ($fromUI) { - $message = "Port $port is in use.
You must stop the process using this port.

". - "Docs: https://coolify.io/docs
". - "Discord: https://coolify.io/discord"; + $ip = $server->ip; + if ($server->id === 0) { + $ip = 'host.docker.internal'; } - throw new \Exception($message); - } - } + $portsToCheck = ['80', '443']; - /** - * Check multiple ports for conflicts in parallel using concurrent processes - */ - private function checkPortsInParallel(Server $server, array $ports, string $proxyContainerName): array - { - $conflicts = []; - - // First, quickly filter out ports used by our own proxy - $ourProxyPorts = $this->getOurProxyPorts($server, $proxyContainerName); - $portsToCheck = array_diff($ports, $ourProxyPorts); - - if (empty($portsToCheck)) { - \Log::info('All ports are used by our proxy, no conflicts to check'); - - return []; - } - - // Build a single optimized command to check all ports at once - $command = $this->buildBatchPortCheckCommand($portsToCheck, $server); - if (! $command) { - \Log::warning('No suitable port checking method available, falling back to sequential'); - - return $this->checkPortsSequentially($server, $portsToCheck, $proxyContainerName); - } - - try { - $output = instant_remote_process([$command], $server, true); - $results = $this->parseBatchPortCheckOutput($output, $portsToCheck); - - foreach ($results as $port => $isConflict) { - if ($isConflict) { - $conflicts[] = $port; + try { + if ($server->proxyType() !== ProxyTypes::NONE->value) { + $proxyCompose = CheckConfiguration::run($server); + if (isset($proxyCompose)) { + $yaml = Yaml::parse($proxyCompose); + $configPorts = []; + if ($server->proxyType() === ProxyTypes::TRAEFIK->value) { + $ports = data_get($yaml, 'services.traefik.ports'); + } elseif ($server->proxyType() === ProxyTypes::CADDY->value) { + $ports = data_get($yaml, 'services.caddy.ports'); + } + if (isset($ports)) { + foreach ($ports as $port) { + $configPorts[] = str($port)->before(':')->value(); + } + } + // Combine default ports with config ports + $portsToCheck = array_merge($portsToCheck, $configPorts); + } + } else { + $portsToCheck = []; } + } catch (\Exception $e) { + Log::error('Error checking proxy: '.$e->getMessage()); } - } catch (\Throwable $e) { - \Log::warning('Batch port check failed, falling back to sequential: '.$e->getMessage()); - - return $this->checkPortsSequentially($server, $portsToCheck, $proxyContainerName); - } - - return $conflicts; - } - - /** - * Get ports currently used by our proxy container - */ - private function getOurProxyPorts(Server $server, string $proxyContainerName): array - { - try { - $getProxyContainerId = "docker ps -a --filter name=$proxyContainerName --format '{{.ID}}'"; - $containerId = trim(instant_remote_process([$getProxyContainerId], $server)); - - if (empty($containerId)) { - return []; + if (count($portsToCheck) === 0) { + return false; } - - $getPortsCommand = "docker inspect $containerId --format '{{json .NetworkSettings.Ports}}' 2>/dev/null || echo '{}'"; - $portsJson = instant_remote_process([$getPortsCommand], $server, true); - $portsData = json_decode($portsJson, true); - - $ports = []; - if (is_array($portsData)) { - foreach (array_keys($portsData) as $portSpec) { - if (preg_match('/^(\d+)\/tcp$/', $portSpec, $matches)) { - $ports[] = $matches[1]; + $portsToCheck = array_values(array_unique($portsToCheck)); + // Check port conflicts in parallel + $conflicts = $this->checkPortConflictsInParallel($server, $portsToCheck, $proxyContainerName); + foreach ($conflicts as $port => $conflict) { + if ($conflict) { + if ($fromUI) { + throw new \Exception("Port $port is in use.
You must stop the process using this port.

Docs: https://coolify.io/docs
Discord: https://coolify.io/discord"); + } else { + return false; } } } - return $ports; - } catch (\Throwable $e) { - \Log::warning('Failed to get proxy ports: '.$e->getMessage()); + return true; + } + } + /** + * Check multiple ports for conflicts in parallel + * Returns an array with port => conflict_status mapping + */ + private function checkPortConflictsInParallel(Server $server, array $ports, string $proxyContainerName): array + { + if (empty($ports)) { return []; } - } - /** - * Build a single command to check multiple ports efficiently - */ - private function buildBatchPortCheckCommand(array $ports, Server $server): ?string - { - $portList = implode('|', $ports); - - // Try different commands in order of preference - $commands = [ - // ss - fastest and most reliable - [ - 'check' => 'command -v ss >/dev/null 2>&1', - 'exec' => "ss -Htuln state listening | grep -E ':($portList) ' | awk '{print \$5}' | cut -d: -f2 | sort -u", - ], - // netstat - widely available - [ - 'check' => 'command -v netstat >/dev/null 2>&1', - 'exec' => "netstat -tuln | grep -E ':($portList) ' | grep LISTEN | awk '{print \$4}' | cut -d: -f2 | sort -u", - ], - // lsof - last resort - [ - 'check' => 'command -v lsof >/dev/null 2>&1', - 'exec' => "lsof -iTCP -sTCP:LISTEN -P -n | grep -E ':($portList) ' | awk '{print \$9}' | cut -d: -f2 | sort -u", - ], - ]; - - foreach ($commands as $cmd) { - try { - instant_remote_process([$cmd['check']], $server); - - return $cmd['exec']; - } catch (\Throwable $e) { - continue; - } - } - - return null; - } - - /** - * Parse output from batch port check command - */ - private function parseBatchPortCheckOutput(string $output, array $portsToCheck): array - { - $results = []; - $usedPorts = array_filter(explode("\n", trim($output))); - - foreach ($portsToCheck as $port) { - $results[$port] = in_array($port, $usedPorts); - } - - return $results; - } - - /** - * Fallback to sequential checking if parallel fails - */ - private function checkPortsSequentially(Server $server, array $ports, string $proxyContainerName): array - { - $conflicts = []; - - foreach ($ports as $port) { - try { - if ($this->isPortConflict($server, $port, $proxyContainerName)) { - $conflicts[] = $port; + try { + // Build concurrent port check commands + $results = Process::concurrently(function ($pool) use ($server, $ports, $proxyContainerName) { + foreach ($ports as $port) { + $commands = $this->buildPortCheckCommands($server, $port, $proxyContainerName); + $pool->command($commands['ssh_command'])->timeout(10); + } + }); + + // Process results + $conflicts = []; + + foreach ($ports as $index => $port) { + $result = $results[$index] ?? null; + + if ($result) { + $conflicts[$port] = $this->parsePortCheckResult($result, $port, $proxyContainerName); + } else { + // If process failed, assume no conflict to avoid false positives + $conflicts[$port] = false; } - } catch (\Throwable $e) { - \Log::warning("Sequential port check failed for port $port: ".$e->getMessage()); - // Continue checking other ports } + + return $conflicts; + } catch (\Throwable $e) { + Log::warning('Parallel port checking failed: '.$e->getMessage().'. Falling back to sequential checking.'); + + // Fallback to sequential checking if parallel fails + $conflicts = []; + foreach ($ports as $port) { + $conflicts[$port] = $this->isPortConflict($server, $port, $proxyContainerName); + } + + return $conflicts; + } + } + + /** + * Build the SSH command for checking a specific port + */ + private function buildPortCheckCommands(Server $server, string $port, string $proxyContainerName): array + { + // First check if our own proxy is using this port (which is fine) + $getProxyContainerId = "docker ps -a --filter name=$proxyContainerName --format '{{.ID}}'"; + $checkProxyPortScript = " + CONTAINER_ID=\$($getProxyContainerId); + if [ ! -z \"\$CONTAINER_ID\" ]; then + if docker inspect \$CONTAINER_ID --format '{{json .NetworkSettings.Ports}}' | grep -q '\"$port/tcp\"'; then + echo 'proxy_using_port'; + exit 0; + fi; + fi; + "; + + // Command sets for different ways to check ports, ordered by preference + $portCheckScript = " + $checkProxyPortScript + + # Try ss command first + if command -v ss >/dev/null 2>&1; then + ss_output=\$(ss -Htuln state listening sport = :$port 2>/dev/null); + if [ -z \"\$ss_output\" ]; then + echo 'port_free'; + exit 0; + fi; + count=\$(echo \"\$ss_output\" | grep -c ':$port '); + if [ \$count -eq 0 ]; then + echo 'port_free'; + exit 0; + fi; + # Check for dual-stack or docker processes + if [ \$count -le 2 ] && (echo \"\$ss_output\" | grep -q 'docker\\|coolify'); then + echo 'port_free'; + exit 0; + fi; + echo \"port_conflict|\$ss_output\"; + exit 0; + fi; + + # Try netstat as fallback + if command -v netstat >/dev/null 2>&1; then + netstat_output=\$(netstat -tuln 2>/dev/null | grep ':$port '); + if [ -z \"\$netstat_output\" ]; then + echo 'port_free'; + exit 0; + fi; + count=\$(echo \"\$netstat_output\" | grep -c 'LISTEN'); + if [ \$count -eq 0 ]; then + echo 'port_free'; + exit 0; + fi; + if [ \$count -le 2 ] && (echo \"\$netstat_output\" | grep -q 'docker\\|coolify'); then + echo 'port_free'; + exit 0; + fi; + echo \"port_conflict|\$netstat_output\"; + exit 0; + fi; + + # Final fallback using nc + if nc -z -w1 127.0.0.1 $port >/dev/null 2>&1; then + echo 'port_conflict|nc_detected'; + else + echo 'port_free'; + fi; + "; + + $sshCommand = \App\Helpers\SshMultiplexingHelper::generateSshCommand($server, $portCheckScript); + + return [ + 'ssh_command' => $sshCommand, + 'script' => $portCheckScript, + ]; + } + + /** + * Parse the result from port check command + */ + private function parsePortCheckResult($processResult, string $port, string $proxyContainerName): bool + { + $exitCode = $processResult->exitCode(); + $output = trim($processResult->output()); + $errorOutput = trim($processResult->errorOutput()); + + if ($exitCode !== 0) { + return false; } - return $conflicts; + if ($output === 'proxy_using_port' || $output === 'port_free') { + return false; // No conflict + } + + if (str_starts_with($output, 'port_conflict|')) { + $details = substr($output, strlen('port_conflict|')); + + // Additional logic to detect dual-stack scenarios + if ($details !== 'nc_detected') { + // Check for dual-stack scenario - typically 1-2 listeners (IPv4+IPv6) + $lines = explode("\n", $details); + if (count($lines) <= 2) { + // Look for IPv4 and IPv6 in the listing + if ((strpos($details, '0.0.0.0:'.$port) !== false && strpos($details, ':::'.$port) !== false) || + (strpos($details, '*:'.$port) !== false && preg_match('/\*:'.$port.'.*IPv[46]/', $details))) { + + return false; // This is just a normal dual-stack setup + } + } + } + + return true; // Real port conflict + } + + return false; } /** @@ -363,168 +284,134 @@ class CheckProxy */ private function isPortConflict(Server $server, string $port, string $proxyContainerName): bool { - // Check if our own proxy is using this port (which is fine) - if ($this->isOurProxyUsingPort($server, $port, $proxyContainerName)) { - return false; - } - - // Try different methods to detect port conflicts - $portCheckMethods = [ - 'checkWithSs', - 'checkWithNetstat', - 'checkWithLsof', - 'checkWithNetcat', - ]; - - foreach ($portCheckMethods as $method) { - try { - $result = $this->$method($server, $port); - if ($result !== null) { - return $result; - } - } catch (\Throwable $e) { - continue; // Try next method - } - } - - // If all methods fail, assume port is free to avoid false positives - return false; - } - - /** - * Check if our own proxy container is using the port - */ - private function isOurProxyUsingPort(Server $server, string $port, string $proxyContainerName): bool - { + // First check if our own proxy is using this port (which is fine) try { $getProxyContainerId = "docker ps -a --filter name=$proxyContainerName --format '{{.ID}}'"; $containerId = trim(instant_remote_process([$getProxyContainerId], $server)); - if (empty($containerId)) { - return false; + if (! empty($containerId)) { + $checkProxyPort = "docker inspect $containerId --format '{{json .NetworkSettings.Ports}}' | grep '\"$port/tcp\"'"; + try { + instant_remote_process([$checkProxyPort], $server); + + // Our proxy is using the port, which is fine + return false; + } catch (\Throwable $e) { + // Our container exists but not using this port + } } - - $checkProxyPort = "docker inspect $containerId --format '{{json .NetworkSettings.Ports}}' | grep '\"$port/tcp\"'"; - instant_remote_process([$checkProxyPort], $server); - - return true; // Our proxy is using the port } catch (\Throwable $e) { - return false; - } - } - - /** - * Check port usage with ss command - */ - private function checkWithSs(Server $server, string $port): ?bool - { - $commands = [ - 'command -v ss >/dev/null 2>&1', - "ss_output=\$(ss -Htuln state listening sport = :$port 2>/dev/null) && echo \"\$ss_output\"", - "echo \"\$ss_output\" | grep -c ':$port '", - ]; - - $output = instant_remote_process($commands, $server, true); - - return $this->parsePortCheckOutput($output, $port); - } - - /** - * Check port usage with netstat command - */ - private function checkWithNetstat(Server $server, string $port): ?bool - { - $commands = [ - 'command -v netstat >/dev/null 2>&1', - "netstat_output=\$(netstat -tuln 2>/dev/null) && echo \"\$netstat_output\" | grep ':$port '", - "echo \"\$netstat_output\" | grep ':$port ' | grep -c 'LISTEN'", - ]; - - $output = instant_remote_process($commands, $server, true); - - return $this->parsePortCheckOutput($output, $port); - } - - /** - * Check port usage with lsof command - */ - private function checkWithLsof(Server $server, string $port): ?bool - { - $commands = [ - 'command -v lsof >/dev/null 2>&1', - "lsof -i :$port -P -n | grep 'LISTEN'", - "lsof -i :$port -P -n | grep 'LISTEN' | wc -l", - ]; - - $output = instant_remote_process($commands, $server, true); - - return $this->parsePortCheckOutput($output, $port); - } - - /** - * Check port usage with netcat as fallback - */ - private function checkWithNetcat(Server $server, string $port): ?bool - { - $checkCommand = "nc -z -w1 127.0.0.1 $port >/dev/null 2>&1 && echo 'in-use' || echo 'free'"; - $result = instant_remote_process([$checkCommand], $server, true); - - return trim($result) === 'in-use'; - } - - /** - * Parse output from port checking commands - */ - private function parsePortCheckOutput(string $output, string $port): ?bool - { - $lines = explode("\n", trim($output)); - $details = trim($lines[0] ?? ''); - $count = intval(trim($lines[1] ?? '0')); - - // No listeners found - if ($count === 0 || empty($details)) { - return false; + // Container not found or error checking, continue with regular checks } - // Check if it's likely our docker/proxy process - if (strpos($details, 'docker') !== false || strpos($details, 'coolify-proxy') !== false) { - return false; - } - - // Handle dual-stack scenarios (1-2 listeners for IPv4+IPv6) - if ($count <= 2 && $this->isDualStackSetup($details, $port)) { - return false; - } - - // Real port conflict detected - return true; - } - - /** - * Detect if this is a normal dual-stack setup (IPv4 + IPv6) - */ - private function isDualStackSetup(string $details, string $port): bool - { - $patterns = [ - // ss output format - '/LISTEN.*:'.$port.'\s/', - '/\*:'.$port.'\s/', - '/:::'.$port.'\s/', - // netstat format - '/0\.0\.0\.0:'.$port.'/', - '/:::'.$port.'/', - // lsof format - '/\*:'.$port.'.*IPv[46]/', + // Command sets for different ways to check ports, ordered by preference + $commandSets = [ + // Set 1: Use ss to check listener counts by protocol stack + [ + 'available' => 'command -v ss >/dev/null 2>&1', + 'check' => [ + // Get listening process details + "ss_output=\$(ss -Htuln state listening sport = :$port 2>/dev/null) && echo \"\$ss_output\"", + // Count IPv4 listeners + "echo \"\$ss_output\" | grep -c ':$port '", + ], + ], + // Set 2: Use netstat as alternative to ss + [ + 'available' => 'command -v netstat >/dev/null 2>&1', + 'check' => [ + // Get listening process details + "netstat_output=\$(netstat -tuln 2>/dev/null) && echo \"\$netstat_output\" | grep ':$port '", + // Count listeners + "echo \"\$netstat_output\" | grep ':$port ' | grep -c 'LISTEN'", + ], + ], + // Set 3: Use lsof as last resort + [ + 'available' => 'command -v lsof >/dev/null 2>&1', + 'check' => [ + // Get process using the port + "lsof -i :$port -P -n | grep 'LISTEN'", + // Count listeners + "lsof -i :$port -P -n | grep 'LISTEN' | wc -l", + ], + ], ]; - $matches = 0; - foreach ($patterns as $pattern) { - if (preg_match($pattern, $details)) { - $matches++; + // Try each command set until we find one available + foreach ($commandSets as $set) { + try { + // Check if the command is available + instant_remote_process([$set['available']], $server); + + // Run the actual check commands + $output = instant_remote_process($set['check'], $server, true); + // Parse the output lines + $lines = explode("\n", trim($output)); + // Get the detailed output and listener count + $details = trim(implode("\n", array_slice($lines, 0, -1))); + $count = intval(trim($lines[count($lines) - 1] ?? '0')); + // If no listeners or empty result, port is free + if ($count == 0 || empty($details)) { + return false; + } + + // Try to detect if this is our coolify-proxy + if (strpos($details, 'docker') !== false || strpos($details, $proxyContainerName) !== false) { + // It's likely our docker or proxy, which is fine + return false; + } + + // Check for dual-stack scenario - typically 1-2 listeners (IPv4+IPv6) + // If exactly 2 listeners and both have same port, likely dual-stack + if ($count <= 2) { + // Check if it looks like a standard dual-stack setup + $isDualStack = false; + + // Look for IPv4 and IPv6 in the listing (ss output format) + if (preg_match('/LISTEN.*:'.$port.'\s/', $details) && + (preg_match('/\*:'.$port.'\s/', $details) || + preg_match('/:::'.$port.'\s/', $details))) { + $isDualStack = true; + } + + // For netstat format + if (strpos($details, '0.0.0.0:'.$port) !== false && + strpos($details, ':::'.$port) !== false) { + $isDualStack = true; + } + + // For lsof format (IPv4 and IPv6) + if (strpos($details, '*:'.$port) !== false && + preg_match('/\*:'.$port.'.*IPv4/', $details) && + preg_match('/\*:'.$port.'.*IPv6/', $details)) { + $isDualStack = true; + } + + if ($isDualStack) { + return false; // This is just a normal dual-stack setup + } + } + + // If we get here, it's likely a real port conflict + return true; + + } catch (\Throwable $e) { + // This command set failed, try the next one + continue; } } - // If we see patterns indicating both IPv4 and IPv6, it's likely dual-stack - return $matches >= 2; + // Fallback to simpler check if all above methods fail + try { + // Just try to bind to the port directly to see if it's available + $checkCommand = "nc -z -w1 127.0.0.1 $port >/dev/null 2>&1 && echo 'in-use' || echo 'free'"; + $result = instant_remote_process([$checkCommand], $server, true); + + return trim($result) === 'in-use'; + } catch (\Throwable $e) { + // If everything fails, assume the port is free to avoid false positives + return false; + } } } diff --git a/app/Actions/Proxy/SaveConfiguration.php b/app/Actions/Proxy/SaveConfiguration.php index f0a31aa1b..f2de2b3f5 100644 --- a/app/Actions/Proxy/SaveConfiguration.php +++ b/app/Actions/Proxy/SaveConfiguration.php @@ -3,7 +3,6 @@ namespace App\Actions\Proxy; use App\Models\Server; -use App\Services\ProxyDashboardCacheService; use Lorisleiva\Actions\Concerns\AsAction; class SaveConfiguration @@ -21,9 +20,6 @@ class SaveConfiguration $server->proxy->last_saved_settings = str($docker_compose_yml_base64)->pipe('md5')->value; $server->save(); - // Clear Traefik dashboard cache when configuration is saved - ProxyDashboardCacheService::clearCache($server); - return instant_remote_process([ "mkdir -p $proxy_path", "echo '$docker_compose_yml_base64' | base64 -d | tee $proxy_path/docker-compose.yml > /dev/null", diff --git a/app/Actions/Proxy/StartProxy.php b/app/Actions/Proxy/StartProxy.php index f98c0d8c2..e7c020ff6 100644 --- a/app/Actions/Proxy/StartProxy.php +++ b/app/Actions/Proxy/StartProxy.php @@ -4,8 +4,8 @@ namespace App\Actions\Proxy; use App\Enums\ProxyTypes; use App\Events\ProxyStatusChanged; +use App\Events\ProxyStatusChangedUI; use App\Models\Server; -use App\Services\ProxyDashboardCacheService; use Lorisleiva\Actions\Concerns\AsAction; use Spatie\Activitylog\Models\Activity; @@ -30,9 +30,6 @@ class StartProxy $server->proxy->last_applied_settings = str($docker_compose_yml_base64)->pipe('md5')->value(); $server->save(); - // Clear Traefik dashboard cache when proxy configuration changes - ProxyDashboardCacheService::clearCache($server); - if ($server->isSwarmManager()) { $commands = $commands->merge([ "mkdir -p $proxy_path/dynamic", @@ -62,11 +59,14 @@ class StartProxy " echo 'Successfully stopped and removed existing coolify-proxy.'", 'fi', "echo 'Starting coolify-proxy.'", - 'docker compose up -d --wait', + 'docker compose up -d --wait --remove-orphans', "echo 'Successfully started coolify-proxy.'", ]); $commands = $commands->merge(connectProxyToNetworks($server)); } + $server->proxy->set('status', 'starting'); + $server->save(); + ProxyStatusChangedUI::dispatch($server->team_id); if ($async) { return remote_process($commands, $server, callEventOnFinish: 'ProxyStatusChanged', callEventData: $server->id); diff --git a/app/Actions/Proxy/StopProxy.php b/app/Actions/Proxy/StopProxy.php index de3ed58a5..29cc63b40 100644 --- a/app/Actions/Proxy/StopProxy.php +++ b/app/Actions/Proxy/StopProxy.php @@ -3,6 +3,7 @@ namespace App\Actions\Proxy; use App\Events\ProxyStatusChanged; +use App\Events\ProxyStatusChangedUI; use App\Models\Server; use App\Services\ProxyDashboardCacheService; use Lorisleiva\Actions\Concerns\AsAction; @@ -15,6 +16,9 @@ class StopProxy { try { $containerName = $server->isSwarm() ? 'coolify-proxy_traefik' : 'coolify-proxy'; + $server->proxy->status = 'stopping'; + $server->save(); + ProxyStatusChangedUI::dispatch($server->team_id); instant_remote_process(command: [ "docker stop --time=$timeout $containerName", @@ -24,12 +28,10 @@ class StopProxy $server->proxy->force_stop = $forceStop; $server->proxy->status = 'exited'; $server->save(); - - // Clear Traefik dashboard cache when proxy stops - ProxyDashboardCacheService::clearCache($server); } catch (\Throwable $e) { return handleError($e); } finally { + ProxyDashboardCacheService::clearCache($server); ProxyStatusChanged::dispatch($server->id); } } diff --git a/app/Jobs/RestartProxyJob.php b/app/Jobs/RestartProxyJob.php index 7e867f853..49cfbba53 100644 --- a/app/Jobs/RestartProxyJob.php +++ b/app/Jobs/RestartProxyJob.php @@ -2,11 +2,9 @@ namespace App\Jobs; -use App\Actions\Proxy\CheckProxy; use App\Actions\Proxy\StartProxy; use App\Actions\Proxy\StopProxy; use App\Models\Server; -use App\Services\ProxyDashboardCacheService; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldBeEncrypted; use Illuminate\Contracts\Queue\ShouldQueue; @@ -40,10 +38,6 @@ class RestartProxyJob implements ShouldBeEncrypted, ShouldQueue StartProxy::run($this->server, force: true); - // Clear Traefik dashboard cache after proxy restart - ProxyDashboardCacheService::clearCache($this->server); - - // CheckProxy::run($this->server, true); } catch (\Throwable $e) { return handleError($e); } diff --git a/app/Listeners/ProxyStatusChangedNotification.php b/app/Listeners/ProxyStatusChangedNotification.php index cad8c3c7b..7b23724e2 100644 --- a/app/Listeners/ProxyStatusChangedNotification.php +++ b/app/Listeners/ProxyStatusChangedNotification.php @@ -14,7 +14,10 @@ class ProxyStatusChangedNotification implements ShouldQueueAfterCommit public function handle(ProxyStatusChanged $event) { $serverId = $event->data; - $server = Server::find($serverId); + if (is_null($serverId)) { + return; + } + $server = Server::where('id', $serverId)->first(); if (is_null($server)) { return; } @@ -23,12 +26,17 @@ class ProxyStatusChangedNotification implements ShouldQueueAfterCommit $server->proxy->set('status', $status); $server->save(); + ProxyStatusChangedUI::dispatch($server->team_id); if ($status === 'running') { $server->setupDefaultRedirect(); $server->setupDynamicProxyConfiguration(); $server->proxy->force_stop = false; $server->save(); } - ProxyStatusChangedUI::dispatch($server->team_id); + if ($status === 'created') { + instant_remote_process([ + 'docker rm -f coolify-proxy', + ], $server); + } } } diff --git a/app/Livewire/ActivityMonitor.php b/app/Livewire/ActivityMonitor.php index 398fdeb0d..54034ef7a 100644 --- a/app/Livewire/ActivityMonitor.php +++ b/app/Livewire/ActivityMonitor.php @@ -20,10 +20,10 @@ class ActivityMonitor extends Component public bool $fullHeight = false; - public bool $showWaiting = false; - public $activity; + public bool $showWaiting = true; + public static $eventDispatched = false; protected $listeners = ['activityMonitor' => 'newMonitorActivity']; diff --git a/app/Livewire/Server/Navbar.php b/app/Livewire/Server/Navbar.php index 222cca9cd..6bfde2b9c 100644 --- a/app/Livewire/Server/Navbar.php +++ b/app/Livewire/Server/Navbar.php @@ -22,11 +22,14 @@ class Navbar extends Component public ?string $serverIp = null; + public ?string $proxyStatus = 'unknown'; + public function getListeners() { $teamId = auth()->user()->currentTeam()->id; return [ + 'refreshServerShow' => '$refresh', "echo-private:team.{$teamId},ProxyStatusChangedUI" => 'showNotification', ]; } @@ -36,13 +39,16 @@ class Navbar extends Component $this->server = $server; $this->currentRoute = request()->route()->getName(); $this->serverIp = $this->server->id === 0 ? base_ip() : $this->server->ip; + $this->proxyStatus = $this->server->proxy->status ?? 'unknown'; $this->loadProxyConfiguration(); } public function loadProxyConfiguration() { try { - $this->traefikDashboardAvailable = ProxyDashboardCacheService::isTraefikDashboardAvailable($this->server); + if ($this->proxyStatus === 'running') { + $this->traefikDashboardAvailable = ProxyDashboardCacheService::isTraefikDashboardAvailableFromCache($this->server); + } } catch (\Throwable $e) { return handleError($e, $this); } @@ -51,8 +57,6 @@ class Navbar extends Component public function restart() { try { - // Clear cache before restarting proxy - ProxyDashboardCacheService::clearCache($this->server); RestartProxyJob::dispatch($this->server); } catch (\Throwable $e) { return handleError($e, $this); @@ -97,37 +101,42 @@ class Navbar extends Component try { $this->isChecking = true; CheckProxy::run($this->server, true); - $this->showNotification(); } catch (\Throwable $e) { return handleError($e, $this); } finally { $this->isChecking = false; + $this->showNotification(); } } public function showNotification() { - $status = $this->server->proxy->status ?? 'unknown'; + $this->proxyStatus = $this->server->proxy->status ?? 'unknown'; $forceStop = $this->server->proxy->force_stop ?? false; - switch ($status) { + switch ($this->proxyStatus) { case 'running': - $this->dispatch('success', 'Proxy is running.'); + // $this->dispatch('success', 'Proxy is running.'); + $this->loadProxyConfiguration(); break; case 'restarting': $this->dispatch('info', 'Initiating proxy restart.'); break; - case 'exited': - if ($forceStop) { - $this->dispatch('info', 'Proxy is stopped manually.'); - } else { - $this->dispatch('info', 'Proxy is stopped manually.
Starting in a moment.'); - } + // case 'exited': + // if (! $forceStop) { + // $this->dispatch('info', 'Proxy is stopped manually.
Starting in a moment.'); + // } + // break; + case 'starting': + // do nothing + break; + case 'stopping': + // do nothing break; default: - $this->dispatch('warning', 'Proxy is not running.'); break; } + } public function render() diff --git a/app/Livewire/Server/Proxy.php b/app/Livewire/Server/Proxy.php index d1e414c7b..9332c2517 100644 --- a/app/Livewire/Server/Proxy.php +++ b/app/Livewire/Server/Proxy.php @@ -5,7 +5,6 @@ namespace App\Livewire\Server; use App\Actions\Proxy\CheckConfiguration; use App\Actions\Proxy\SaveConfiguration; use App\Models\Server; -use App\Services\ProxyDashboardCacheService; use Livewire\Component; class Proxy extends Component @@ -43,9 +42,6 @@ class Proxy extends Component $this->server->proxy = null; $this->server->save(); - // Clear Traefik dashboard cache when proxy type changes - ProxyDashboardCacheService::clearCache($this->server); - $this->dispatch('reloadWindow'); } @@ -55,9 +51,6 @@ class Proxy extends Component $this->server->changeProxy($proxy_type, async: false); $this->selectedProxy = $this->server->proxy->type; - // Clear Traefik dashboard cache when proxy type is selected - ProxyDashboardCacheService::clearCache($this->server); - $this->dispatch('reloadWindow'); } catch (\Throwable $e) { return handleError($e, $this); diff --git a/app/Livewire/Server/Show.php b/app/Livewire/Server/Show.php index 1d37a9c8c..d803ff6a6 100644 --- a/app/Livewire/Server/Show.php +++ b/app/Livewire/Server/Show.php @@ -184,7 +184,6 @@ class Show extends Component public function refresh() { $this->syncData(); - $this->dispatch('$refresh'); } public function validateServer($install = true) diff --git a/app/Livewire/Server/ValidateAndInstall.php b/app/Livewire/Server/ValidateAndInstall.php index dccfe34cb..479fdef22 100644 --- a/app/Livewire/Server/ValidateAndInstall.php +++ b/app/Livewire/Server/ValidateAndInstall.php @@ -2,6 +2,8 @@ namespace App\Livewire\Server; +use App\Actions\Proxy\CheckProxy; +use App\Actions\Proxy\StartProxy; use App\Models\Server; use Livewire\Component; @@ -25,8 +27,6 @@ class ValidateAndInstall extends Component public $docker_version = null; - public $proxy_started = false; - public $error = null; public bool $ask = false; @@ -47,7 +47,6 @@ class ValidateAndInstall extends Component $this->docker_installed = null; $this->docker_version = null; $this->docker_compose_installed = null; - $this->proxy_started = null; $this->error = null; $this->number_of_tries = $data; if (! $this->ask) { @@ -135,7 +134,12 @@ class ValidateAndInstall extends Component if ($this->docker_version) { $this->dispatch('refreshServerShow'); $this->dispatch('refreshBoardingIndex'); - $this->dispatch('success', 'Server validated.'); + $this->dispatch('success', 'Server validated, proxy is starting in a moment.'); + $proxyShouldRun = CheckProxy::run($this->server, true); + if (! $proxyShouldRun) { + return; + } + StartProxy::dispatch($this->server); } else { $requiredDockerVersion = str(config('constants.docker.minimum_required_version'))->before('.'); $this->error = 'Minimum Docker Engine version '.$requiredDockerVersion.' is not instaled. Please install Docker manually before continuing: documentation.'; diff --git a/app/Services/ProxyDashboardCacheService.php b/app/Services/ProxyDashboardCacheService.php index 2b7aaef62..5d31f9b08 100644 --- a/app/Services/ProxyDashboardCacheService.php +++ b/app/Services/ProxyDashboardCacheService.php @@ -15,34 +15,25 @@ class ProxyDashboardCacheService return "server:{$server->id}:traefik:dashboard_available"; } + /** + * Check if Traefik dashboard is available from configuration + */ + public static function isTraefikDashboardAvailableFromConfiguration(Server $server, string $proxy_configuration): void + { + $cacheKey = static::getCacheKey($server); + $dashboardAvailable = str($proxy_configuration)->contains('--api.dashboard=true') && + str($proxy_configuration)->contains('--api.insecure=true'); + Cache::forever($cacheKey, $dashboardAvailable); + } + /** * Check if Traefik dashboard is available (from cache or compute) */ - public static function isTraefikDashboardAvailable(Server $server): bool + public static function isTraefikDashboardAvailableFromCache(Server $server): bool { $cacheKey = static::getCacheKey($server); - // Try to get from cache first - $cachedValue = Cache::get($cacheKey); - - if ($cachedValue !== null) { - return $cachedValue; - } - - // If not in cache, compute the value - try { - $proxy_settings = \App\Actions\Proxy\CheckConfiguration::run($server); - $dashboardAvailable = str($proxy_settings)->contains('--api.dashboard=true') && - str($proxy_settings)->contains('--api.insecure=true'); - - // Cache the result (cache indefinitely until proxy restart) - Cache::forever($cacheKey, $dashboardAvailable); - - return $dashboardAvailable; - } catch (\Throwable $e) { - // If there's an error checking configuration, default to false and don't cache - return false; - } + return Cache::get($cacheKey) ?? false; } /** @@ -50,8 +41,7 @@ class ProxyDashboardCacheService */ public static function clearCache(Server $server): void { - $cacheKey = static::getCacheKey($server); - Cache::forget($cacheKey); + Cache::forget(static::getCacheKey($server)); } /** diff --git a/resources/views/components/status/restarting.blade.php b/resources/views/components/status/restarting.blade.php index 4314efa8b..b22526ba0 100644 --- a/resources/views/components/status/restarting.blade.php +++ b/resources/views/components/status/restarting.blade.php @@ -9,9 +9,9 @@ @endif -
+
- @if ($lastDeploymentLink) + @if ($lastDeploymentLink) {{ str($status)->before(':')->headline() }} diff --git a/resources/views/livewire/activity-monitor.blade.php b/resources/views/livewire/activity-monitor.blade.php index 8982d4d9a..83f1ee5e3 100644 --- a/resources/views/livewire/activity-monitor.blade.php +++ b/resources/views/livewire/activity-monitor.blade.php @@ -57,7 +57,7 @@ @else @if ($showWaiting)
- +
@endif @endif diff --git a/resources/views/livewire/project/database/heading.blade.php b/resources/views/livewire/project/database/heading.blade.php index 9ad93e632..a13da4195 100644 --- a/resources/views/livewire/project/database/heading.blade.php +++ b/resources/views/livewire/project/database/heading.blade.php @@ -3,7 +3,7 @@ Database Startup - +
diff --git a/resources/views/livewire/project/service/heading.blade.php b/resources/views/livewire/project/service/heading.blade.php index 05d70f41f..ced2b3fa7 100644 --- a/resources/views/livewire/project/service/heading.blade.php +++ b/resources/views/livewire/project/service/heading.blade.php @@ -3,7 +3,7 @@ Service Startup - +

{{ $title }}

diff --git a/resources/views/livewire/server/cloudflare-tunnel.blade.php b/resources/views/livewire/server/cloudflare-tunnel.blade.php index c3b23a133..a482aa5a1 100644 --- a/resources/views/livewire/server/cloudflare-tunnel.blade.php +++ b/resources/views/livewire/server/cloudflare-tunnel.blade.php @@ -87,7 +87,7 @@ Cloudflare Tunnel Configuration - +
- - - - - - - Close - - - + + Proxy Startup Logs + + + +

Server

@if ($server->proxySet()) -
- @if (data_get($server, 'proxy.force_stop', false) === false) - - Refresh - Checking... - - @endif - -
- @if (data_get($server, 'proxy.status') === 'running') - - @elseif (data_get($server, 'proxy.status') === 'restarting') - +
+
+ @if ($proxyStatus === 'running') + + @elseif ($proxyStatus === 'restarting') + + @elseif ($proxyStatus === 'stopping') + + @elseif ($proxyStatus === 'starting') + @elseif (data_get($server, 'proxy.force_stop')) - - @elseif (data_get($server, 'proxy.status') === 'exited') - - @else - + +
+
+ Checking Ports Availability... +
+ @elseif ($proxyStatus === 'exited') + + @endif + + @if ($proxyStatus !== 'exited') +
+
+ + + + + +
+
+ + @endif
- @endif
{{ data_get($server, 'name') }}
@@ -85,7 +102,7 @@ - @if (data_get($server, 'proxy.status') === 'running') + @if ($proxyStatus === 'running')
@@ -155,7 +172,6 @@ diff --git a/resources/views/livewire/server/validate-and-install.blade.php b/resources/views/livewire/server/validate-and-install.blade.php index b57e0425a..814f81652 100644 --- a/resources/views/livewire/server/validate-and-install.blade.php +++ b/resources/views/livewire/server/validate-and-install.blade.php @@ -120,7 +120,7 @@ @endif @endif - + @isset($error) 
{!! $error !!}
@endisset