Merge pull request #1238 from coollabsio/next

Fixes

.github/workflows/development-build.yml

@@ -13,7 +13,7 @@ env:
 
 jobs:
   amd64:
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, x64]
     steps:
       - uses: actions/checkout@v3
       - name: Login to ghcr.io

.github/workflows/production-build.yml

@@ -10,7 +10,7 @@ env:
 
 jobs:
   amd64:
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, x64]
     steps:
       - uses: actions/checkout@v3
       - name: Login to ghcr.io

app/Actions/CoolifyTask/RunRemoteProcess.php

@@ -5,14 +5,12 @@ namespace App\Actions\CoolifyTask;
 use App\Enums\ActivityTypes;
 use App\Enums\ProcessStatus;
 use App\Jobs\ApplicationDeploymentJob;
+use App\Models\Server;
 use Illuminate\Process\ProcessResult;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Process;
 use Spatie\Activitylog\Models\Activity;
 
-const TIMEOUT = 3600;
-const IDLE_TIMEOUT = 3600;
-
 class RunRemoteProcess
 {
     public Activity $activity;
@@ -76,8 +74,7 @@ class RunRemoteProcess
         $this->time_start = hrtime(true);
 
         $status = ProcessStatus::IN_PROGRESS;
-
-        $processResult = Process::timeout(TIMEOUT)->idleTimeout(IDLE_TIMEOUT)->run($this->getCommand(), $this->handleOutput(...));
+        $processResult = Process::forever()->run($this->getCommand(), $this->handleOutput(...));
 
         if ($this->activity->properties->get('status') === ProcessStatus::ERROR->value) {
             $status = ProcessStatus::ERROR;
@@ -97,9 +94,8 @@ class RunRemoteProcess
             'status' => $status->value,
         ]);
         $this->activity->save();
-
         if ($processResult->exitCode() != 0 && !$this->ignore_errors) {
-            throw new \RuntimeException($processResult->errorOutput());
+            throw new \RuntimeException($processResult->errorOutput(), $processResult->exitCode());
         }
 
         return $processResult;
@@ -107,13 +103,11 @@ class RunRemoteProcess
 
     protected function getCommand(): string
     {
-        $user = $this->activity->getExtraProperty('user');
-        $server_ip = $this->activity->getExtraProperty('server_ip');
-        $private_key_location = $this->activity->getExtraProperty('private_key_location');
-        $port = $this->activity->getExtraProperty('port');
+        $server_uuid = $this->activity->getExtraProperty('server_uuid');
         $command = $this->activity->getExtraProperty('command');
+        $server = Server::whereUuid($server_uuid)->firstOrFail();
 
-        return generate_ssh_command($private_key_location, $server_ip, $user, $port, $command);
+        return generateSshCommand($server, $command);
     }
 
     protected function handleOutput(string $type, string $output)

app/Actions/License/CheckResaleLicense.php

@@ -57,13 +57,13 @@ class CheckResaleLicense
                 throw new \Exception('Invalid license key.');
             }
             throw new \Exception('Cannot activate license key.');
-        } catch (\Throwable $th) {
-            ray($th);
+        } catch (\Throwable $e) {
+            ray($e);
             $settings->update([
                 'resale_license' => null,
                 'is_resale_license_active' => false,
             ]);
-            throw $th;
+            throw $e;
         }
     }
 }

app/Actions/Proxy/CheckConfiguration.php

@@ -2,24 +2,26 @@
 
 namespace App\Actions\Proxy;
 
+use Lorisleiva\Actions\Concerns\AsAction;
 use App\Models\Server;
 use Illuminate\Support\Str;
 
-class CheckConfigurationSync
+class CheckConfiguration
 {
-    public function __invoke(Server $server, bool $reset = false)
+    use AsAction;
+    public function handle(Server $server, bool $reset = false)
     {
         $proxy_path = get_proxy_path();
         $proxy_configuration = instant_remote_process([
             "cat $proxy_path/docker-compose.yml",
         ], $server, false);
 
-        if ($reset || is_null($proxy_configuration)) {
+        if ($reset || !$proxy_configuration || is_null($proxy_configuration)) {
             $proxy_configuration = Str::of(generate_default_proxy_configuration($server))->trim()->value;
-            resolve(SaveConfigurationSync::class)($server, $proxy_configuration);
-            return $proxy_configuration;
         }
-
+        if (!$proxy_configuration || is_null($proxy_configuration)) {
+            throw new \Exception("Could not generate proxy configuration");
+        }
         return $proxy_configuration;
     }
 }

app/Actions/Proxy/SaveConfiguration.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Actions\Proxy;
+
+use App\Models\Server;
+use Illuminate\Support\Str;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class SaveConfiguration
+{
+    use AsAction;
+
+    public function handle(Server $server)
+    {
+        $proxy_settings = CheckConfiguration::run($server, true);
+        $proxy_path = get_proxy_path();
+        $docker_compose_yml_base64 = base64_encode($proxy_settings);
+
+        $server->proxy->last_saved_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;
+        $server->save();
+
+        return instant_remote_process([
+            "mkdir -p $proxy_path",
+            "echo '$docker_compose_yml_base64' | base64 -d > $proxy_path/docker-compose.yml",
+        ], $server);
+    }
+}

app/Actions/Proxy/SaveConfigurationSync.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Actions\Proxy;
-
-use App\Models\Server;
-use Illuminate\Support\Str;
-
-class SaveConfigurationSync
-{
-    public function __invoke(Server $server, string $configuration)
-    {
-        try {
-            $proxy_path = get_proxy_path();
-            $docker_compose_yml_base64 = base64_encode($configuration);
-
-            $server->proxy->last_saved_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;
-            $server->save();
-
-            instant_remote_process([
-                "mkdir -p $proxy_path",
-                "echo '$docker_compose_yml_base64' | base64 -d > $proxy_path/docker-compose.yml",
-            ], $server);
-        } catch (\Throwable $th) {
-            ray($th);
-        }
-
-    }
-}

app/Actions/Proxy/StartProxy.php

@@ -6,12 +6,23 @@ use App\Enums\ProxyStatus;
 use App\Enums\ProxyTypes;
 use App\Models\Server;
 use Illuminate\Support\Str;
+use Lorisleiva\Actions\Concerns\AsAction;
 use Spatie\Activitylog\Models\Activity;
 
 class StartProxy
 {
-    public function __invoke(Server $server): Activity
+    use AsAction;
+    public function handle(Server $server, bool $async = true): Activity|string
     {
+        $proxyType = data_get($server,'proxy.type');
+        if ($proxyType === 'none') {
+            return 'OK';
+        }
+        if (is_null($proxyType)) {
+            $server->proxy->type = ProxyTypes::TRAEFIK_V2->value;
+            $server->proxy->status = ProxyStatus::EXITED->value;
+            $server->save();
+        }
         $proxy_path = get_proxy_path();
         $networks = collect($server->standaloneDockers)->map(function ($docker) {
             return $docker['network'];
@@ -23,28 +34,44 @@ class StartProxy
             return "docker network ls --format '{{.Name}}' | grep '^$network$' >/dev/null 2>&1 || docker network create --attachable $network > /dev/null 2>&1";
         });
 
-        $configuration = resolve(CheckConfigurationSync::class)($server);
-
+        $configuration = CheckConfiguration::run($server);
+        if (!$configuration) {
+            throw new \Exception("Configuration is not synced");
+        }
         $docker_compose_yml_base64 = base64_encode($configuration);
         $server->proxy->last_applied_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;
         $server->save();
-
-        $activity = remote_process([
+        $commands = [
+            "command -v lsof >/dev/null || echo '####### Installing lsof...'",
+            "command -v lsof >/dev/null || apt-get update",
+            "command -v lsof >/dev/null || apt install -y lsof",
+            "command -v lsof >/dev/null || command -v fuser >/dev/null || apt install -y psmisc",
             "echo '####### Creating required Docker networks...'",
             ...$create_networks_command,
             "cd $proxy_path",
             "echo '####### Creating Docker Compose file...'",
             "echo '####### Pulling docker image...'",
-            'docker compose pull',
-            "echo '####### Stopping existing proxy...'",
-            'docker compose down -v --remove-orphans',
-            "lsof -nt -i:80 | xargs -r kill -9",
-            "lsof -nt -i:443 | xargs -r kill -9",
-            "echo '####### Starting proxy...'",
-            'docker compose up -d --remove-orphans',
+            'docker compose pull || docker-compose pull',
+            "echo '####### Stopping existing coolify-proxy...'",
+            "docker compose down -v --remove-orphans > /dev/null 2>&1 || docker-compose down -v --remove-orphans > /dev/null 2>&1 || true",
+            "command -v fuser >/dev/null || command -v lsof >/dev/null || echo '####### Could not kill existing processes listening on port 80 & 443. Please stop the process holding these ports...'",
+            "command -v lsof >/dev/null && lsof -nt -i:80 | xargs -r kill -9 || true",
+            "command -v lsof >/dev/null && lsof -nt -i:443 | xargs -r kill -9 || true",
+            "command -v fuser >/dev/null && fuser -k 80/tcp || true",
+            "command -v fuser >/dev/null && fuser -k 443/tcp || true",
+            "systemctl disable nginx > /dev/null 2>&1 || true",
+            "systemctl disable apache2 > /dev/null 2>&1 || true",
+            "systemctl disable apache > /dev/null 2>&1 || true",
+            "echo '####### Starting coolify-proxy...'",
+            'docker compose up -d --remove-orphans || docker-compose up -d --remove-orphans',
             "echo '####### Proxy installed successfully...'"
-        ], $server);
-
-        return $activity;
+        ];
+        if (!$async) {
+            instant_remote_process($commands, $server);
+            return 'OK';
+        } else {
+            $activity = remote_process($commands, $server);
+            return $activity;
+        }
     }
 }

app/Actions/Server/InstallDocker.php

@@ -4,11 +4,10 @@ namespace App\Actions\Server;
 
 use App\Models\Server;
 use App\Models\StandaloneDocker;
-use App\Models\Team;
 
 class InstallDocker
 {
-    public function __invoke(Server $server, Team $team)
+    public function __invoke(Server $server)
     {
         $dockerVersion = '24.0';
         $config = base64_encode('{
@@ -19,15 +18,16 @@ class InstallDocker
             }
           }');
         $found = StandaloneDocker::where('server_id', $server->id);
-        if ($found->count() == 0) {
+        if ($found->count() == 0 && $server->id) {
             StandaloneDocker::create([
                 'name' => 'coolify',
                 'network' => 'coolify',
                 'server_id' => $server->id,
             ]);
         }
-        if (isDev()) {
-            return remote_process([
+
+        if (isDev() && $server->id === 0) {
+            $command = [
                 "echo '####### Installing Prerequisites...'",
                 "sleep 1",
                 "echo '####### Installing/updating Docker Engine...'",
@@ -35,9 +35,9 @@ class InstallDocker
                 "sleep 4",
                 "echo '####### Restarting Docker Engine...'",
                 "ls -l /tmp"
-            ], $server);
+            ];
         } else {
-            return remote_process([
+            $command = [
                 "echo '####### Installing Prerequisites...'",
                 "command -v jq >/dev/null || apt-get update",
                 "command -v jq >/dev/null || apt install -y jq",
@@ -53,7 +53,8 @@ class InstallDocker
                 "echo '####### Creating default Docker network (coolify)...'",
                 "docker network create --attachable coolify >/dev/null 2>&1 || true",
                 "echo '####### Done!'"
-            ], $server);
+            ];
         }
+        return remote_process($command, $server);
     }
 }

app/Actions/Server/UpdateCoolify.php

@@ -43,11 +43,11 @@ class UpdateCoolify
                 $this->update();
             }
             send_internal_notification('InstanceAutoUpdateJob done to version: ' . $this->latestVersion . ' from version: ' . $this->currentVersion);
-        } catch (\Exception $th) {
+        } catch (\Throwable $e) {
             ray('InstanceAutoUpdateJob failed');
-            ray($th->getMessage());
-            send_internal_notification('InstanceAutoUpdateJob failed: ' . $th->getMessage());
-            throw $th;
+            ray($e->getMessage());
+            send_internal_notification('InstanceAutoUpdateJob failed: ' . $e->getMessage());
+            throw $e;
         }
     }
 

app/Console/Commands/Emails.php

@@ -2,12 +2,16 @@
 
 namespace App\Console\Commands;
 
+use App\Jobs\SendConfirmationForWaitlistJob;
 use App\Models\Application;
 use App\Models\ApplicationPreview;
 use App\Models\ScheduledDatabaseBackup;
+use App\Models\Server;
 use App\Models\StandalonePostgresql;
+use App\Models\Team;
 use App\Models\TeamInvitation;
 use App\Models\User;
+use App\Models\Waitlist;
 use App\Notifications\Application\DeploymentFailed;
 use App\Notifications\Application\DeploymentSuccess;
 use App\Notifications\Application\StatusChanged;
@@ -20,32 +24,33 @@ use Illuminate\Console\Command;
 use Illuminate\Mail\Message;
 use Illuminate\Notifications\Messages\MailMessage;
 use Mail;
-use Str;
+use Illuminate\Support\Str;
 
+use function Laravel\Prompts\confirm;
 use function Laravel\Prompts\select;
 use function Laravel\Prompts\text;
 
-class TestEmail extends Command
+class Emails extends Command
 {
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
-    protected $signature = 'email:test';
+    protected $signature = 'emails';
 
     /**
      * The console command description.
      *
      * @var string
      */
-    protected $description = 'Send a test email to the admin';
+    protected $description = 'Send out test / prod emails';
 
     /**
      * Execute the console command.
      */
     private ?MailMessage $mail = null;
-    private string $email = 'andras.bacsai@protonmail.com';
+    private ?string $email = null;
     public function handle()
     {
         $type = select(
@@ -57,12 +62,17 @@ class TestEmail extends Command
                 'application-status-changed' => 'Application - Status Changed',
                 'backup-success' => 'Database - Backup Success',
                 'backup-failed' => 'Database - Backup Failed',
-                'invitation-link' => 'Invitation Link',
+                // 'invitation-link' => 'Invitation Link',
                 'waitlist-invitation-link' => 'Waitlist Invitation Link',
                 'waitlist-confirmation' => 'Waitlist Confirmation',
+                'realusers-before-trial' => 'REAL - Registered Users Before Trial without Subscription',
+                'realusers-server-lost-connection' => 'REAL - Server Lost Connection',
             ],
         );
-        $this->email = text('Email Address to send to');
+        $emailsGathered = ['realusers-before-trial','realusers-server-lost-connection'];
+        if (!in_array($type, $emailsGathered)) {
+            $this->email = text('Email Address to send to');
+        }
         set_transanctional_email_settings();
 
         $this->mail = new MailMessage();
@@ -131,45 +141,99 @@ class TestEmail extends Command
                 $this->mail = (new BackupSuccess($backup, $db))->toMail();
                 $this->sendEmail();
                 break;
-            case 'invitation-link':
-                $user = User::all()->first();
-                $invitation = TeamInvitation::whereEmail($user->email)->first();
-                if (!$invitation) {
-                    $invitation = TeamInvitation::create([
-                        'uuid' => Str::uuid(),
-                        'email' => $user->email,
-                        'team_id' => 1,
-                        'link' => 'http://example.com',
-                    ]);
-                }
-                $this->mail = (new InvitationLink($user))->toMail();
-                $this->sendEmail();
-                break;
+            // case 'invitation-link':
+            //     $user = User::all()->first();
+            //     $invitation = TeamInvitation::whereEmail($user->email)->first();
+            //     if (!$invitation) {
+            //         $invitation = TeamInvitation::create([
+            //             'uuid' => Str::uuid(),
+            //             'email' => $user->email,
+            //             'team_id' => 1,
+            //             'link' => 'http://example.com',
+            //         ]);
+            //     }
+            //     $this->mail = (new InvitationLink($user))->toMail();
+            //     $this->sendEmail();
+            //     break;
             case 'waitlist-invitation-link':
                 $this->mail = new MailMessage();
                 $this->mail->view('emails.waitlist-invitation', [
-                    'email' => 'test2@example.com',
-                    'password' => "supersecretpassword",
+                    'loginLink' => 'https://coolify.io',
                 ]);
                 $this->mail->subject('Congratulations! You are invited to join Coolify Cloud.');
                 $this->sendEmail();
                 break;
             case 'waitlist-confirmation':
+                $found = Waitlist::where('email', $this->email)->first();
+                if ($found) {
+                    SendConfirmationForWaitlistJob::dispatch($this->email, $found->uuid);
+                } else {
+                    throw new Exception('Waitlist not found');
+                }
+
+                break;
+            case 'realusers-before-trial':
                 $this->mail = new MailMessage();
-                $this->mail->view(
-                    'emails.waitlist-confirmation',
-                    [
-                        'confirmation_url' => 'http://example.com',
-                        'cancel_url' => 'http://example.com',
-                    ]
-                );
-                $this->mail->subject('You are on the waitlist!');
-                $this->sendEmail();
+                $this->mail->view('emails.before-trial-conversion');
+                $this->mail->subject('Trial period has been added for all subscription plans.');
+                $teams = Team::doesntHave('subscription')->where('id', '!=', 0)->get();
+                if (!$teams || $teams->isEmpty()) {
+                    echo 'No teams found.' . PHP_EOL;
+                    return;
+                }
+                $emails = [];
+                foreach ($teams as $team) {
+                    foreach ($team->members as $member) {
+                        if ($member->email) {
+                            $emails[] = $member->email;
+                        }
+                    }
+                }
+                $emails = array_unique($emails);
+                $this->info("Sending to " . count($emails) . " emails.");
+                foreach ($emails as $email) {
+                    $this->info($email);
+                }
+                $confirmed = confirm('Are you sure?');
+                if ($confirmed) {
+                    foreach ($emails as $email) {
+                        $this->sendEmail($email);
+                    }
+                }
+                break;
+            case 'realusers-server-lost-connection':
+                $serverId = text('Server Id');
+                $server = Server::find($serverId);
+                if (!$server) {
+                    throw new Exception('Server not found');
+                }
+                $admins = [];
+                $members = $server->team->members;
+                foreach ($members as $member) {
+                    if ($member->isAdmin()) {
+                        $admins[] = $member->email;
+                    }
+                }
+                $this->info('Sending to ' . count($admins) . ' admins.');
+                foreach ($admins as $admin) {
+                    $this->info($admin);
+                }
+                $this->mail = new MailMessage();
+                $this->mail->view('emails.server-lost-connection', [
+                    'name' => $server->name,
+                ]);
+                $this->mail->subject('Action required: Server ' . $server->name . ' lost connection.');
+                foreach ($admins as $email) {
+                    $this->sendEmail($email);
+                }
                 break;
         }
     }
-    private function sendEmail()
+    private function sendEmail(string $email = null)
     {
+        if ($email) {
+            $this->email = $email;
+        }
         Mail::send(
             [],
             [],
@@ -178,5 +242,6 @@ class TestEmail extends Command
                 ->subject($this->mail->subject)
                 ->html((string)$this->mail->render())
         );
+        $this->info("Email sent to $this->email successfully. 📧");
     }
 }

app/Console/Commands/Init.php

@@ -26,7 +26,7 @@ class Init extends Command
                 $deployment->status = ApplicationDeploymentStatus::FAILED->value;
                 $deployment->save();
             }
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             echo "Error: {$e->getMessage()}\n";
         }
     }

app/Console/Commands/SyncBunny.php

@@ -82,7 +82,7 @@ class SyncBunny extends Command
                 $pool->purge("$bunny_cdn/$bunny_cdn_path/$versions"),
             ]);
             echo "All files uploaded & purged...\n";
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             echo $e->getMessage();
         }
     }

app/Console/Commands/WaitlistInvite.php

@@ -19,7 +19,7 @@ class WaitlistInvite extends Command
      *
      * @var string
      */
-    protected $signature = 'waitlist:invite {email?} {--only-email}';
+    protected $signature = 'waitlist:invite {--people=1} {--only-email} {email?}';
 
     /**
      * The console command description.
@@ -33,6 +33,12 @@ class WaitlistInvite extends Command
      */
     public function handle()
     {
+        $people = $this->option('people');
+        for ($i = 0; $i < $people; $i++) {
+            $this->main();
+        }
+    }
+    private function main() {
         if ($this->argument('email')) {
             if ($this->option('only-email')) {
                 $this->next_patient = User::whereEmail($this->argument('email'))->first();
@@ -86,13 +92,10 @@ class WaitlistInvite extends Command
     }
     private function send_email()
     {
-        ray($this->next_patient->email, $this->password);
         $token = Crypt::encryptString("{$this->next_patient->email}@@@$this->password");
         $loginLink = route('auth.link', ['token' => $token]);
         $mail = new MailMessage();
         $mail->view('emails.waitlist-invitation', [
-            'email' => $this->next_patient->email,
-            'password' => $this->password,
             'loginLink' => $loginLink,
         ]);
         $mail->subject('Congratulations! You are invited to join Coolify Cloud.');

app/Console/Kernel.php

@@ -2,19 +2,15 @@
 
 namespace App\Console;
 
-use App\Jobs\ApplicationContainerStatusJob;
 use App\Jobs\CheckResaleLicenseJob;
 use App\Jobs\CleanupInstanceStuffsJob;
 use App\Jobs\DatabaseBackupJob;
-use App\Jobs\DatabaseContainerStatusJob;
 use App\Jobs\DockerCleanupJob;
 use App\Jobs\InstanceAutoUpdateJob;
-use App\Jobs\ProxyCheckJob;
-use App\Jobs\ResourceStatusJob;
-use App\Models\Application;
+use App\Jobs\ContainerStatusJob;
 use App\Models\InstanceSettings;
 use App\Models\ScheduledDatabaseBackup;
-use App\Models\StandalonePostgresql;
+use App\Models\Server;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
@@ -23,37 +19,35 @@ class Kernel extends ConsoleKernel
     protected function schedule(Schedule $schedule): void
     {
         if (isDev()) {
-            $schedule->command('horizon:snapshot')->everyMinute();
-            // $schedule->job(new ResourceStatusJob)->everyMinute();
-            $schedule->job(new ProxyCheckJob)->everyFiveMinutes();
-            $schedule->job(new CleanupInstanceStuffsJob)->everyMinute();
+            // $schedule->job(new ContainerStatusJob(Server::find(0)))->everyTenMinutes()->onOneServer();
+            // $schedule->command('horizon:snapshot')->everyMinute();
+            $schedule->job(new CleanupInstanceStuffsJob)->everyMinute()->onOneServer();
             // $schedule->job(new CheckResaleLicenseJob)->hourly();
-            $schedule->job(new DockerCleanupJob)->everyOddHour();
+            // $schedule->job(new DockerCleanupJob)->everyOddHour();
+            // $this->instance_auto_update($schedule);
+            // $this->check_scheduled_backups($schedule);
+            $this->check_resources($schedule);
         } else {
             $schedule->command('horizon:snapshot')->everyFiveMinutes();
-            $schedule->job(new CleanupInstanceStuffsJob)->everyTenMinutes()->onOneServer();
-            // $schedule->job(new ResourceStatusJob)->everyMinute()->onOneServer();
+            $schedule->job(new CleanupInstanceStuffsJob)->everyTwoMinutes()->onOneServer();
             $schedule->job(new CheckResaleLicenseJob)->hourly()->onOneServer();
-            $schedule->job(new ProxyCheckJob)->everyFiveMinutes()->onOneServer();
             $schedule->job(new DockerCleanupJob)->everyTenMinutes()->onOneServer();
+            $this->instance_auto_update($schedule);
+            $this->check_scheduled_backups($schedule);
+            $this->check_resources($schedule);
         }
-        $this->instance_auto_update($schedule);
-        $this->check_scheduled_backups($schedule);
-        $this->check_resources($schedule);
     }
     private function check_resources($schedule)
     {
-        $applications = Application::all();
-        foreach ($applications as $application) {
-            $schedule->job(new ApplicationContainerStatusJob($application))->everyMinute()->onOneServer();
-        }
+        $servers = Server::all()->where('settings.is_usable', true)->where('settings.is_reachable', true);
+        ray($servers);
 
-        $postgresqls = StandalonePostgresql::all();
-        foreach ($postgresqls as $postgresql) {
-            $schedule->job(new DatabaseContainerStatusJob($postgresql))->everyMinute()->onOneServer();
+        foreach ($servers as $server) {
+            $schedule->job(new ContainerStatusJob($server))->everyMinute()->onOneServer();
         }
     }
-    private function instance_auto_update($schedule){
+    private function instance_auto_update($schedule)
+    {
         if (isDev()) {
             return;
         }
@@ -74,7 +68,7 @@ class Kernel extends ConsoleKernel
             if (!$scheduled_backup->enabled) {
                 continue;
             }
-            if (is_null(data_get($scheduled_backup,'database'))) {
+            if (is_null(data_get($scheduled_backup, 'database'))) {
                 ray('database not found');
                 $scheduled_backup->delete();
                 continue;

app/Data/CoolifyTaskArgs.php

@@ -12,16 +12,16 @@ use Spatie\LaravelData\Data;
 class CoolifyTaskArgs extends Data
 {
     public function __construct(
-        public string  $server_ip,
-        public string  $private_key_location,
+        public string  $server_uuid,
         public string  $command,
-        public int     $port,
-        public string  $user,
         public string  $type,
         public ?string $type_uuid = null,
         public ?Model  $model = null,
-        public string  $status = ProcessStatus::QUEUED->value,
+        public ?string  $status = null ,
         public bool    $ignore_errors = false,
     ) {
+        if(is_null($status)){
+            $this->status = ProcessStatus::QUEUED->value;
+        }
     }
 }

app/Exceptions/Handler.php

@@ -3,6 +3,7 @@
 namespace App\Exceptions;
 
 use App\Models\InstanceSettings;
+use App\Models\User;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Sentry\Laravel\Integration;
 use Sentry\State\Scope;
@@ -25,7 +26,7 @@ class Handler extends ExceptionHandler
      * @var array<int, class-string<\Throwable>>
      */
     protected $dontReport = [
-        //
+        ProcessException::class
     ];
     /**
      * A list of the inputs that are never flashed to the session on validation exceptions.
@@ -45,13 +46,21 @@ class Handler extends ExceptionHandler
     public function register(): void
     {
         $this->reportable(function (Throwable $e) {
+            if (isDev()) {
+                return;
+            }
             $this->settings = InstanceSettings::get();
-            if ($this->settings->do_not_track || isDev()) {
+            if ($this->settings->do_not_track) {
                 return;
             }
             app('sentry')->configureScope(
-                function (Scope $scope){
-                    $scope->setUser(['id'=> config('sentry.server_name')]);
+                function (Scope $scope) {
+                    $scope->setUser(
+                        [
+                            'email' => auth()->user()->email,
+                            'instanceAdmin' => User::find(0)->email
+                        ]
+                    );
                 }
             );
             Integration::captureUnhandledException($e);

app/Exceptions/ProcessException.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Exceptions;
+
+use Exception;
+
+class ProcessException extends Exception
+{
+
+}

app/Http/Controllers/Controller.php

@@ -3,21 +3,17 @@
 namespace App\Http\Controllers;
 
 use App\Models\InstanceSettings;
-use App\Models\Project;
 use App\Models\S3Storage;
 use App\Models\StandalonePostgresql;
 use App\Models\TeamInvitation;
 use App\Models\User;
-use Auth;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\Http;
-use Throwable;
-use Str;
-
+use Illuminate\Support\Str;
 
 class Controller extends BaseController
 {
@@ -35,8 +31,15 @@ class Controller extends BaseController
                 return redirect()->route('login');
             }
             if (Hash::check($password, $user->password)) {
+                $invitation = TeamInvitation::whereEmail($email);
+                if ($invitation->exists()) {
+                    $team = $invitation->first()->team;
+                    $user->teams()->attach($team->id, ['role' => $invitation->first()->role]);
+                    $invitation->delete();
+                } else {
+                    $team = $user->teams()->first();
+                }
                 Auth::login($user);
-                $team = $user->teams()->first();
                 session(['currentTeam' => $team]);
                 return redirect()->route('dashboard');
             }
@@ -137,25 +140,21 @@ class Controller extends BaseController
         try {
             $invitation = TeamInvitation::whereUuid(request()->route('uuid'))->firstOrFail();
             $user = User::whereEmail($invitation->email)->firstOrFail();
-            if (is_null(auth()->user())) {
-                return redirect()->route('login');
-            }
             if (auth()->user()->id !== $user->id) {
                 abort(401);
             }
-
-            $createdAt = $invitation->created_at;
-            $diff = $createdAt->diffInMinutes(now());
-            if ($diff <= config('constants.invitation.link.expiration')) {
+            $invitationValid = $invitation->isValid();
+            if ($invitationValid) {
                 $user->teams()->attach($invitation->team->id, ['role' => $invitation->role]);
+                refreshSession($invitation->team);
                 $invitation->delete();
                 return redirect()->route('team.index');
             } else {
-                $invitation->delete();
                 abort(401);
             }
-        } catch (Throwable $th) {
-            throw $th;
+        } catch (\Throwable $e) {
+            ray($e->getMessage());
+            throw $e;
         }
     }
 
@@ -172,8 +171,8 @@ class Controller extends BaseController
             }
             $invitation->delete();
             return redirect()->route('team.index');
-        } catch (Throwable $th) {
-            throw $th;
+        } catch (\Throwable $e) {
+            throw $e;
         }
     }
 }

app/Http/Livewire/Boarding/Index.php

@@ -14,6 +14,7 @@ class Index extends Component
 {
     public string $currentState = 'welcome';
 
+    public ?string $selectedServerType = null;
     public ?Collection $privateKeys = null;
     public ?int $selectedExistingPrivateKey = null;
     public ?string $privateKeyType = null;
@@ -36,6 +37,11 @@ class Index extends Component
     public ?int $selectedExistingProject = null;
     public ?Project $createdProject = null;
 
+    public bool $dockerInstallationStarted = false;
+
+    public string $serverPublicKey;
+    public bool $serverReachable = true;
+
     public function mount()
     {
         $this->privateKeyName = generate_random_name();
@@ -53,20 +59,16 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
             $this->remoteServerHost = 'coolify-testing-host';
         }
     }
-    public function welcome() {
+    public function explanation()
+    {
         if (isCloud()) {
             return $this->setServerType('remote');
         }
         $this->currentState = 'select-server-type';
     }
+
     public function restartBoarding()
     {
-        if ($this->createdServer) {
-            $this->createdServer->delete();
-        }
-        if ($this->createdPrivateKey) {
-            $this->createdPrivateKey->delete();
-        }
         return redirect()->route('boarding');
     }
     public function skipBoarding()
@@ -81,13 +83,15 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
 
     public function setServerType(string $type)
     {
-        if ($type === 'localhost') {
+        $this->selectedServerType = $type;
+        if ($this->selectedServerType === 'localhost') {
             $this->createdServer = Server::find(0);
             if (!$this->createdServer) {
                 return $this->emit('error', 'Localhost server is not found. Something went wrong during installation. Please try to reinstall or contact support.');
             }
-            return $this->validateServer();
-        } elseif ($type === 'remote') {
+            $this->serverPublicKey = $this->createdServer->privateKey->publicKey();
+            return $this->validateServer('localhost');
+        } elseif ($this->selectedServerType === 'remote') {
             $this->privateKeys = PrivateKey::ownedByCurrentTeam(['name'])->where('id', '!=', 0)->get();
             if ($this->privateKeys->count() > 0) {
                 $this->selectedExistingPrivateKey = $this->privateKeys->first()->id;
@@ -110,11 +114,11 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
             return;
         }
         $this->selectedExistingPrivateKey = $this->createdServer->privateKey->id;
+        $this->serverPublicKey = $this->createdServer->privateKey->publicKey();
         $this->validateServer();
-        $this->getProxyType();
-        $this->getProjects();
     }
-    public function getProxyType() {
+    public function getProxyType()
+    {
         $proxyTypeSet = $this->createdServer->proxy->type;
         if (!$proxyTypeSet) {
             $this->currentState = 'select-proxy';
@@ -124,6 +128,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
     }
     public function selectExistingPrivateKey()
     {
+        $this->createdPrivateKey = PrivateKey::find($this->selectedExistingPrivateKey);
         $this->currentState = 'create-server';
     }
     public function createNewServer()
@@ -135,7 +140,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
     {
         $this->selectedExistingPrivateKey = null;
         $this->privateKeyType = $type;
-        if ($type === 'create' && !isDev()) {
+        if ($type === 'create') {
             $this->createNewPrivateKey();
         }
         $this->currentState = 'create-private-key';
@@ -146,6 +151,13 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
             'privateKeyName' => 'required',
             'privateKey' => 'required',
         ]);
+        $this->createdPrivateKey = PrivateKey::create([
+            'name' => $this->privateKeyName,
+            'description' => $this->privateKeyDescription,
+            'private_key' => $this->privateKey,
+            'team_id' => currentTeam()->id
+        ]);
+        $this->createdPrivateKey->save();
         $this->currentState = 'create-server';
     }
     public function saveServer()
@@ -153,16 +165,14 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
         $this->validate([
             'remoteServerName' => 'required',
             'remoteServerHost' => 'required',
-            'remoteServerPort' => 'required',
+            'remoteServerPort' => 'required|integer',
             'remoteServerUser' => 'required',
         ]);
         $this->privateKey = formatPrivateKey($this->privateKey);
-        $this->createdPrivateKey = PrivateKey::create([
-            'name' => $this->privateKeyName,
-            'description' => $this->privateKeyDescription,
-            'private_key' => $this->privateKey,
-            'team_id' => currentTeam()->id
-        ]);
+        $foundServer = Server::whereIp($this->remoteServerHost)->first();
+        if ($foundServer) {
+            return $this->emit('error', 'IP address is already in use by another team.');
+        }
         $this->createdServer = Server::create([
             'name' => $this->remoteServerName,
             'ip' => $this->remoteServerHost,
@@ -170,38 +180,52 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
             'user' => $this->remoteServerUser,
             'description' => $this->remoteServerDescription,
             'private_key_id' => $this->createdPrivateKey->id,
-            'team_id' => currentTeam()->id
+            'team_id' => currentTeam()->id,
         ]);
+        $this->createdServer->save();
         $this->validateServer();
     }
-    public function validateServer() {
+    public function validateServer()
+    {
         try {
-            ['uptime' => $uptime, 'dockerVersion' => $dockerVersion] = validateServer($this->createdServer);
-            if (!$uptime) {
-                throw new \Exception('Server is not reachable.');
-            } else {
-                $this->createdServer->settings->update([
-                    'is_reachable' => true,
-                ]);
-                $this->emit('success', 'Server is reachable.');
-            }
-            ray($dockerVersion, $uptime);
-            if (!$dockerVersion) {
-                $this->emit('error', 'Docker is not installed on the server.');
-                $this->currentState = 'install-docker';
-                return;
-            }
-            $this->getProxyType();
+            $customErrorMessage = "Server is not reachable:";
+            config()->set('coolify.mux_enabled', false);
 
-        } catch (\Exception $e) {
-            return general_error_handler(customErrorMessage: "Server is not reachable. Reason: {$e->getMessage()}", that: $this);
+            instant_remote_process(['uptime'], $this->createdServer, true);
+
+            $this->createdServer->settings()->update([
+                'is_reachable' => true,
+            ]);
+        } catch (\Throwable $e) {
+            $this->serverReachable = false;
+            return handleError(error: $e, customErrorMessage: $customErrorMessage, livewire: $this);
+        }
+
+        try {
+            $dockerVersion = instant_remote_process(["docker version|head -2|grep -i version| awk '{print $2}'"], $this->createdServer, true);
+            $dockerVersion = checkMinimumDockerEngineVersion($dockerVersion);
+            if (is_null($dockerVersion)) {
+                $this->currentState = 'install-docker';
+                throw new \Exception('Docker version is not supported or not installed.');
+            }
+            $this->createdServer->settings()->update([
+                'is_usable' => true,
+            ]);
+            $this->getProxyType();
+        } catch (\Throwable $e) {
+            $this->dockerInstallationStarted = false;
+            return handleError(error: $e, customErrorMessage: $customErrorMessage, livewire: $this);
         }
     }
     public function installDocker()
     {
-        $activity = resolve(InstallDocker::class)($this->createdServer, currentTeam());
+        $this->dockerInstallationStarted = true;
+        $activity = resolve(InstallDocker::class)($this->createdServer);
         $this->emit('newMonitorActivity', $activity->id);
-        $this->currentState = 'select-proxy';
+    }
+    public function dockerInstalledOrSkipped()
+    {
+        $this->validateServer();
     }
     public function selectProxy(string|null $proxyType = null)
     {
@@ -214,14 +238,16 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
         $this->getProjects();
     }
 
-    public function getProjects() {
+    public function getProjects()
+    {
         $this->projects = Project::ownedByCurrentTeam(['name'])->get();
         if ($this->projects->count() > 0) {
             $this->selectedExistingProject = $this->projects->first()->id;
         }
         $this->currentState = 'create-project';
     }
-    public function selectExistingProject() {
+    public function selectExistingProject()
+    {
         $this->createdProject = Project::find($this->selectedExistingProject);
         $this->currentState = 'create-resource';
     }
@@ -241,7 +267,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
             [
                 'project_uuid' => $this->createdProject->uuid,
                 'environment_name' => 'production',
-                'server'=> $this->createdServer->id,
+                'server' => $this->createdServer->id,
             ]
         );
     }

app/Http/Livewire/CheckLicense.php

@@ -34,9 +34,9 @@ class CheckLicense extends Component
             try {
                 resolve(CheckResaleLicense::class)();
                 $this->emit('reloadWindow');
-            } catch (\Throwable $th) {
-                session()->flash('error', 'Something went wrong. Please contact support. <br>Error: ' . $th->getMessage());
-                ray($th->getMessage());
+            } catch (\Throwable $e) {
+                session()->flash('error', 'Something went wrong. Please contact support. <br>Error: ' . $e->getMessage());
+                ray($e->getMessage());
                 return redirect()->to('/settings/license');
             }
         }

app/Http/Livewire/Destination/Form.php

@@ -37,8 +37,8 @@ class Form extends Component
             }
             $this->destination->delete();
             return redirect()->route('dashboard');
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e);
+        } catch (\Throwable $e) {
+            return handleError($e);
         }
     }
 }

app/Http/Livewire/Destination/New/StandaloneDocker.php

@@ -71,8 +71,8 @@ class StandaloneDocker extends Component
             }
             $this->createNetworkAndAttachToProxy();
             return redirect()->route('destination.show', $docker->uuid);
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e, that: $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 

app/Http/Livewire/ForcePasswordReset.php

@@ -36,8 +36,8 @@ class ForcePasswordReset extends Component
                 send_internal_notification('First login for ' . auth()->user()->email);
             }
             return redirect()->route('dashboard');
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e, that: $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 }

app/Http/Livewire/Help.php

@@ -19,7 +19,7 @@ class Help extends Component
     ];
     public function mount()
     {
-        $this->path = Route::current()->uri();
+        $this->path = Route::current()?->uri() ?? null;
         if (isDev()) {
             $this->description = "I'm having trouble with {$this->path}";
             $this->subject = "Help with {$this->path}";
@@ -30,7 +30,7 @@ class Help extends Component
         try {
             $this->rateLimit(1, 60);
             $this->validate();
-            $subscriptionType = auth()->user()?->subscription?->type() ?? 'unknown';
+            $subscriptionType = auth()->user()?->subscription?->type() ?? 'Free';
             $debug = "Route: {$this->path}";
             $mail = new MailMessage();
             $mail->view(
@@ -41,10 +41,10 @@ class Help extends Component
                 ]
             );
             $mail->subject("[HELP - {$subscriptionType}]: {$this->subject}");
-            send_user_an_email($mail, 'hi@coollabs.io');
+            send_user_an_email($mail,  auth()->user()?->email, 'hi@coollabs.io');
             $this->emit('success', 'Your message has been sent successfully. We will get in touch with you as soon as possible.');
-        } catch (\Exception $e) {
-            return general_error_handler($e, $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
     public function render()

app/Http/Livewire/Notifications/DiscordSettings.php

@@ -29,7 +29,7 @@ class DiscordSettings extends Component
     {
         try {
             $this->submit();
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             ray($e->getMessage());
             $this->team->discord_enabled = false;
             $this->validate();
@@ -46,9 +46,7 @@ class DiscordSettings extends Component
     public function saveModel()
     {
         $this->team->save();
-        if (is_a($this->team, Team::class)) {
-            refreshSession();
-        }
+        refreshSession();
         $this->emit('success', 'Settings saved.');
     }
 

app/Http/Livewire/Notifications/EmailSettings.php

@@ -62,9 +62,10 @@ class EmailSettings extends Component
                 'team.smtp_from_name' => 'required',
             ]);
             $this->team->save();
+            refreshSession();
             $this->emit('success', 'Settings saved successfully.');
-        } catch (\Exception $e) {
-            return general_error_handler($e, $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
     public function sendTestNotification()
@@ -81,9 +82,10 @@ class EmailSettings extends Component
             $this->team->smtp_enabled = false;
             $this->team->resend_enabled = false;
             $this->team->save();
+            refreshSession();
             $this->emit('success', 'Settings saved successfully.');
-        } catch (\Exception $e) {
-            return general_error_handler($e, $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 
@@ -92,9 +94,9 @@ class EmailSettings extends Component
         try {
             $this->team->smtp_enabled = false;
             $this->submitResend();
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $this->team->smtp_enabled = false;
-            return general_error_handler($e, $this);
+            return handleError($e, $this);
         }
     }
     public function instantSave()
@@ -102,17 +104,15 @@ class EmailSettings extends Component
         try {
             $this->team->resend_enabled = false;
             $this->submit();
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $this->team->smtp_enabled = false;
-            return general_error_handler($e, $this);
+            return handleError($e, $this);
         }
     }
     public function saveModel()
     {
         $this->team->save();
-        if (is_a($this->team, Team::class)) {
-            refreshSession();
-        }
+        refreshSession();
         $this->emit('success', 'Settings saved.');
     }
     public function submit()
@@ -130,10 +130,11 @@ class EmailSettings extends Component
                 'team.smtp_timeout' => 'nullable',
             ]);
             $this->team->save();
+            refreshSession();
             $this->emit('success', 'Settings saved successfully.');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $this->team->smtp_enabled = false;
-            return general_error_handler($e, $this);
+            return handleError($e, $this);
         }
     }
     public function submitResend()
@@ -141,14 +142,16 @@ class EmailSettings extends Component
         try {
             $this->resetErrorBag();
             $this->validate([
+                'team.smtp_from_address' => 'required|email',
+                'team.smtp_from_name' => 'required',
                 'team.resend_api_key' => 'required'
             ]);
             $this->team->save();
             refreshSession();
             $this->emit('success', 'Settings saved successfully.');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $this->team->resend_enabled = false;
-            return general_error_handler($e, $this);
+            return handleError($e, $this);
         }
     }
     public function copyFromInstanceSettings()

app/Http/Livewire/Notifications/TelegramSettings.php

@@ -35,7 +35,7 @@ class TelegramSettings extends Component
     {
         try {
             $this->submit();
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             ray($e->getMessage());
             $this->team->telegram_enabled = false;
             $this->validate();
@@ -52,9 +52,7 @@ class TelegramSettings extends Component
     public function saveModel()
     {
         $this->team->save();
-        if (is_a($this->team, Team::class)) {
-            refreshSession();
-        }
+        refreshSession();
         $this->emit('success', 'Settings saved.');
     }
 

app/Http/Livewire/PrivateKey/Change.php

@@ -8,7 +8,7 @@ use Livewire\Component;
 class Change extends Component
 {
     public PrivateKey $private_key;
-
+    public $public_key;
     protected $rules = [
         'private_key.name' => 'required|string',
         'private_key.description' => 'nullable|string',
@@ -21,6 +21,14 @@ class Change extends Component
         'private_key.private_key' => 'private key'
     ];
 
+    public function mount()
+    {
+        try {
+            $this->public_key = $this->private_key->publicKey();
+        }catch(\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
     public function delete()
     {
         try {
@@ -30,8 +38,8 @@ class Change extends Component
                 return redirect()->route('security.private-key.index');
             }
             $this->emit('error', 'This private key is in use and cannot be deleted. Please delete all servers, applications, and GitHub/GitLab apps that use this private key before deleting it.');
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e, that: $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 
@@ -41,8 +49,8 @@ class Change extends Component
             $this->private_key->private_key = formatPrivateKey($this->private_key->private_key);
             $this->private_key->save();
             refresh_server_connection($this->private_key);
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e, that: $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 }

app/Http/Livewire/PrivateKey/Create.php

@@ -3,14 +3,20 @@
 namespace App\Http\Livewire\PrivateKey;
 
 use App\Models\PrivateKey;
+use DanHarrin\LivewireRateLimiting\WithRateLimiting;
 use Livewire\Component;
+use phpseclib3\Crypt\PublicKeyLoader;
 
 class Create extends Component
 {
-    public string|null $from = null;
+    use WithRateLimiting;
     public string $name;
-    public string|null $description = null;
     public string $value;
+
+    public ?string $from = null;
+    public ?string $description = null;
+    public ?string $publicKey = null;
+
     protected $rules = [
         'name' => 'required|string',
         'value' => 'required|string',
@@ -20,6 +26,32 @@ class Create extends Component
         'value' => 'private Key',
     ];
 
+    public function generateNewKey()
+    {
+        try {
+            $this->rateLimit(10);
+            $this->name = generate_random_name();
+            $this->description = 'Created by Coolify';
+            ['private' => $this->value, 'public' => $this->publicKey] = generateSSHKey();
+        } catch(\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function updated($updateProperty)
+    {
+        if ($updateProperty === 'value') {
+            try {
+                $this->publicKey = PublicKeyLoader::load($this->$updateProperty)->getPublicKey()->toString('OpenSSH',['comment' => '']);
+            } catch (\Throwable $e) {
+                if ($this->$updateProperty === "") {
+                    $this->publicKey = "";
+                } else {
+                    $this->publicKey = "Invalid private key";
+                }
+            }
+        }
+        $this->validateOnly($updateProperty);
+    }
     public function createPrivateKey()
     {
         $this->validate();
@@ -38,8 +70,8 @@ class Create extends Component
                 return redirect()->route('server.create');
             }
             return redirect()->route('security.private-key.show', ['private_key_uuid' => $private_key->uuid]);
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e, that: $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 }

app/Http/Livewire/Profile/Form.php

@@ -34,7 +34,7 @@ class Form extends Component
                 'name' => $this->name,
             ]);
         } catch (\Throwable $e) {
-            return general_error_handler(err: $e, that: $this);
+            return handleError($e, $this);
         }
     }
 }

app/Http/Livewire/Project/AddEmpty.php

@@ -28,8 +28,8 @@ class AddEmpty extends Component
                 'team_id' => currentTeam()->id,
             ]);
             return redirect()->route('project.show', $project->uuid);
-        } catch (\Exception $e) {
-            general_error_handler($e, $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         } finally {
             $this->name = '';
         }

app/Http/Livewire/Project/AddEnvironment.php

@@ -31,8 +31,8 @@ class AddEnvironment extends Component
                 'project_uuid' => $this->project->uuid,
                 'environment_name' => $environment->name,
             ]);
-        } catch (\Exception $e) {
-            general_error_handler($e, $this);
+        } catch (\Throwable $e) {
+            handleError($e, $this);
         } finally {
             $this->name = '';
         }

app/Http/Livewire/Project/Application/DeploymentNavbar.php

@@ -65,7 +65,7 @@ class DeploymentNavbar extends Component
                 ]);
             }
         } catch (\Throwable $e) {
-            return general_error_handler(err: $e, that: $this);
+            return handleError($e, $this);
         }
     }
 }

app/Http/Livewire/Project/Application/General.php

@@ -159,8 +159,8 @@ class General extends Component
             }
             $this->application->save();
             $this->emit('success', 'Application settings updated!');
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e, that: $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 }

app/Http/Livewire/Project/Application/Heading.php

@@ -2,9 +2,8 @@
 
 namespace App\Http\Livewire\Project\Application;
 
-use App\Jobs\ApplicationContainerStatusJob;
+use App\Jobs\ContainerStatusJob;
 use App\Models\Application;
-use App\Notifications\Application\StatusChanged;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
 
@@ -22,10 +21,11 @@ class Heading extends Component
 
     public function check_status()
     {
-        dispatch_sync(new ApplicationContainerStatusJob(
-            application: $this->application,
-        ));
+        dispatch_sync(new ContainerStatusJob($this->application->destination->server));
         $this->application->refresh();
+        $this->application->previews->each(function ($preview) {
+            $preview->refresh();
+        });
     }
 
     public function force_deploy_without_cache()
@@ -68,10 +68,11 @@ class Heading extends Component
                     ["docker rm -f {$containerName}"],
                     $this->application->destination->server
                 );
-                $this->application->status = 'stopped';
+                $this->application->status = 'exited';
                 $this->application->save();
                 // $this->application->environment->project->team->notify(new StatusChanged($this->application));
             }
         }
+        $this->application->refresh();
     }
 }

app/Http/Livewire/Project/Application/Previews.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Livewire\Project\Application;
 
-use App\Jobs\ApplicationContainerStatusJob;
 use App\Models\Application;
 use App\Models\ApplicationPreview;
 use Illuminate\Support\Collection;
@@ -23,14 +22,6 @@ class Previews extends Component
         $this->parameters = get_route_parameters();
     }
 
-    public function loadStatus($pull_request_id)
-    {
-        dispatch(new ApplicationContainerStatusJob(
-            application: $this->application,
-            pullRequestId: $pull_request_id
-        ));
-    }
-
     public function load_prs()
     {
         try {
@@ -39,7 +30,7 @@ class Previews extends Component
             $this->pull_requests = $data->sortBy('number')->values();
         } catch (\Throwable $e) {
             $this->rate_limit_remaining = 0;
-            return general_error_handler(err: $e, that: $this);
+            return handleError($e, $this);
         }
     }
 
@@ -68,7 +59,7 @@ class Previews extends Component
                 'environment_name' => $this->parameters['environment_name'],
             ]);
         } catch (\Throwable $e) {
-            return general_error_handler(err: $e, that: $this);
+            return handleError($e, $this);
         }
     }
 
@@ -88,7 +79,7 @@ class Previews extends Component
             ApplicationPreview::where('application_id', $this->application->id)->where('pull_request_id', $pull_request_id)->delete();
             $this->application->refresh();
         } catch (\Throwable $e) {
-            return general_error_handler(err: $e, that: $this);
+            return handleError($e, $this);
         }
     }
 

app/Http/Livewire/Project/Application/Rollback.php

@@ -65,7 +65,7 @@ class Rollback extends Component
                 ];
             })->toArray();
         } catch (\Throwable $e) {
-            return general_error_handler(err: $e, that: $this);
+            return handleError($e, $this);
         }
     }
 }

app/Http/Livewire/Project/Database/BackupEdit.php

@@ -51,7 +51,7 @@ class BackupEdit extends Component
             $this->backup->save();
             $this->backup->refresh();
             $this->emit('success', 'Backup updated successfully');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $this->emit('error', $e->getMessage());
         }
     }
@@ -76,7 +76,7 @@ class BackupEdit extends Component
             $this->backup->save();
             $this->backup->refresh();
             $this->emit('success', 'Backup updated successfully');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $this->emit('error', $e->getMessage());
         }
     }

app/Http/Livewire/Project/Database/CreateScheduledBackup.php

@@ -42,8 +42,8 @@ class CreateScheduledBackup extends Component
                 'team_id' => currentTeam()->id,
             ]);
             $this->emit('refreshScheduledBackups');
-        } catch (\Exception $e) {
-            general_error_handler($e, $this);
+        } catch (\Throwable $e) {
+            handleError($e, $this);
         } finally {
             $this->frequency = '';
             $this->save_s3 = true;

app/Http/Livewire/Project/Database/Heading.php

@@ -3,8 +3,7 @@
 namespace App\Http\Livewire\Project\Database;
 
 use App\Actions\Database\StartPostgresql;
-use App\Jobs\DatabaseContainerStatusJob;
-use App\Notifications\Application\StatusChanged;
+use App\Jobs\ContainerStatusJob;
 use Livewire\Component;
 
 class Heading extends Component
@@ -25,9 +24,7 @@ class Heading extends Component
 
     public function check_status()
     {
-        dispatch_sync(new DatabaseContainerStatusJob(
-            database: $this->database,
-        ));
+        dispatch_sync(new ContainerStatusJob($this->database->destination->server));
         $this->database->refresh();
     }
 
@@ -38,7 +35,7 @@ class Heading extends Component
 
     public function stop()
     {
-        remote_process(
+        instant_remote_process(
             ["docker rm -f {$this->database->uuid}"],
             $this->database->destination->server
         );
@@ -46,9 +43,9 @@ class Heading extends Component
             stopPostgresProxy($this->database);
             $this->database->is_public = false;
         }
-        $this->database->status = 'stopped';
+        $this->database->status = 'exited';
         $this->database->save();
-        $this->emit('refresh');
+        $this->check_status();
         // $this->database->environment->project->team->notify(new StatusChanged($this->database));
     }
 

app/Http/Livewire/Project/Database/InitScript.php

@@ -36,7 +36,7 @@ class InitScript extends Component
             $this->script['filename'] = $this->filename;
             $this->emitUp('save_init_script', $this->script);
         } catch (Exception $e) {
-            return general_error_handler(err: $e, that: $this);
+            return handleError($e, $this);
         }
     }
 

app/Http/Livewire/Project/Database/Postgresql/General.php

@@ -5,6 +5,7 @@ namespace App\Http\Livewire\Project\Database\Postgresql;
 use App\Models\StandalonePostgresql;
 use Exception;
 use Livewire\Component;
+
 use function Aws\filter;
 
 class General extends Component
@@ -73,9 +74,9 @@ class General extends Component
             }
             $this->getDbUrl();
             $this->database->save();
-        } catch(Exception $e) {
+        } catch(\Throwable $e) {
             $this->database->is_public = !$this->database->is_public;
-            return general_error_handler(err: $e, that: $this);
+            return handleError($e, $this);
         }
 
     }
@@ -140,7 +141,7 @@ class General extends Component
             $this->database->save();
             $this->emit('success', 'Database updated successfully.');
         } catch (Exception $e) {
-            return general_error_handler(err: $e, that: $this);
+            return handleError($e, $this);
         }
     }
 }

app/Http/Livewire/Project/Edit.php

@@ -19,8 +19,8 @@ class Edit extends Component
         try {
             $this->project->save();
             $this->emit('saved');
-        } catch (\Exception $e) {
-            return general_error_handler($e, $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 }

app/Http/Livewire/Project/New/GithubPrivateRepository.php

@@ -164,8 +164,8 @@ class GithubPrivateRepository extends Component
                 'environment_name' => $environment->name,
                 'project_uuid' => $project->uuid,
             ]);
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e, that: $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 

app/Http/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php

@@ -117,8 +117,8 @@ class GithubPrivateRepositoryDeployKey extends Component
                 'environment_name' => $environment->name,
                 'application_uuid' => $application->uuid,
             ]);
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e, that: $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 

app/Http/Livewire/Project/New/PublicGitRepository.php

@@ -75,15 +75,15 @@ class PublicGitRepository extends Component
         $this->get_git_source();
         $this->get_branch();
         $this->selected_branch = $this->git_branch;
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e, that: $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
         if (!$this->branch_found && $this->git_branch == 'main') {
             try {
                 $this->git_branch = 'master';
                 $this->get_branch();
-            } catch (\Exception $e) {
-                return general_error_handler(err: $e, that: $this);
+            } catch (\Throwable $e) {
+                return handleError($e, $this);
             }
         }
     }
@@ -161,8 +161,8 @@ class PublicGitRepository extends Component
                 'environment_name' => $environment->name,
                 'application_uuid' => $application->uuid,
             ]);
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e, that: $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 }

app/Http/Livewire/Project/New/Select.php

@@ -40,8 +40,8 @@ class Select extends Component
     //     try {
     //         instantCommand("psql {$this->existingPostgresqlUrl} -c 'SELECT 1'");
     //         $this->emit('success', 'Successfully connected to the database.');
-    //     } catch (\Exception $e) {
-    //         return general_error_handler($e, $this);
+    //     } catch (\Throwable $e) {
+    //         return handleError($e, $this);
     //     }
     // }
     public function setType(string $type)

app/Http/Livewire/Project/Shared/EnvironmentVariable/All.php

@@ -5,7 +5,7 @@ namespace App\Http\Livewire\Project\Shared\EnvironmentVariable;
 use App\Models\EnvironmentVariable;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
-use Str;
+use Illuminate\Support\Str;
 
 class All extends Component
 {
@@ -77,6 +77,11 @@ class All extends Component
                 $environment->save();
             }
         }
+        if ($isPreview) {
+            $this->emit('success', 'Preview environment variables updated successfully.');
+        } else {
+            $this->emit('success', 'Environment variables updated successfully.');
+        }
         $this->refreshEnvs();
     }
     public function refreshEnvs()
@@ -108,8 +113,8 @@ class All extends Component
             $environment->save();
             $this->refreshEnvs();
             $this->emit('success', 'Environment variable added successfully.');
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e, that: $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 }

app/Http/Livewire/Project/Shared/ResourceLimits.php

@@ -53,8 +53,8 @@ class ResourceLimits extends Component
             $this->validate();
             $this->resource->save();
             $this->emit('success', 'Resource limits updated successfully.');
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e, that: $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 }

app/Http/Livewire/Project/Shared/Storages/All.php

@@ -28,8 +28,8 @@ class All extends Component
             $this->resource->refresh();
             $this->emit('success', 'Storage added successfully');
             $this->emit('clearAddStorage');
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e, that: $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 }

app/Http/Livewire/RunCommand.php

@@ -32,8 +32,8 @@ class RunCommand extends Component
         try {
             $activity = remote_process([$this->command], Server::where('uuid', $this->server)->first(), ignore_errors: true);
             $this->emit('newMonitorActivity', $activity->id);
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 }

app/Http/Livewire/Server/Form.php

@@ -15,6 +15,7 @@ class Form extends Component
     public $dockerVersion;
     public string|null $wildcard_domain = null;
     public int $cleanup_after_percentage;
+    public bool $dockerInstallationStarted = false;
 
     protected $rules = [
         'server.name' => 'required|min:6',
@@ -44,29 +45,34 @@ class Form extends Component
 
     public function installDocker()
     {
-        $activity = resolve(InstallDocker::class)($this->server, currentTeam());
+        $this->dockerInstallationStarted = true;
+        $activity = resolve(InstallDocker::class)($this->server);
         $this->emit('newMonitorActivity', $activity->id);
     }
 
     public function validateServer()
     {
         try {
-            ['uptime' => $uptime, 'dockerVersion' => $dockerVersion] = validateServer($this->server);
+            ['uptime' => $uptime, 'dockerVersion' => $dockerVersion] = validateServer($this->server, true);
             if ($uptime) {
                 $this->uptime = $uptime;
-                $this->emit('success', 'Server is reachable!');
+                $this->emit('success', 'Server is reachable.');
             } else {
-                throw new \Exception('Server is not rachable');
+                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 {
-                throw new \Exception('Old Docker version detected (lower than 23).');
+                $this->emit('error', 'No Docker Engine or older than 23 version installed.');
             }
-        } catch (\Exception $e) {
-            return general_error_handler($e, that: $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this, customErrorMessage: "Server is not reachable: ");
         }
     }
 
@@ -80,24 +86,20 @@ class Form extends Component
             }
             $this->server->delete();
             return redirect()->route('server.all');
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e, that: $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
     public function submit()
     {
         $this->validate();
-        // $validation = Validator::make($this->server->toArray(), [
-        //     'ip' => [
-        //         'ip'
-        //     ],
-        // ]);
-        // if ($validation->fails()) {
-        //     foreach ($validation->errors()->getMessages() as $key => $value) {
-        //         $this->addError("server.{$key}", $value[0]);
-        //     }
-        //     return;
-        // }
+        $uniqueIPs = Server::all()->reject(function (Server $server) {
+            return $server->id === $this->server->id;
+        })->pluck('ip')->toArray();
+        if (in_array($this->server->ip, $uniqueIPs)) {
+            $this->emit('error', 'IP address is already in use by another team.');
+            return;
+        }
         $this->server->settings->wildcard_domain = $this->wildcard_domain;
         $this->server->settings->cleanup_after_percentage = $this->cleanup_after_percentage;
         $this->server->settings->save();

app/Http/Livewire/Server/New/ByIp.php

@@ -26,7 +26,7 @@ class ByIp extends Component
     protected $rules = [
         'name' => 'required|string',
         'description' => 'nullable|string',
-        'ip' => 'required|ip',
+        'ip' => 'required',
         'user' => 'required|string',
         'port' => 'required|integer',
     ];
@@ -58,7 +58,7 @@ class ByIp extends Component
     {
         $this->validate();
         try {
-            if (!$this->private_key_id) {
+            if (is_null($this->private_key_id)) {
                 return $this->emit('error', 'You must select a private key');
             }
             $server = Server::create([
@@ -78,8 +78,8 @@ class ByIp extends Component
             $server->settings->is_part_of_swarm = $this->is_part_of_swarm;
             $server->settings->save();
             return redirect()->route('server.show', $server->uuid);
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e);
+        } catch (\Throwable $e) {
+            return handleError($e);
         }
     }
 }

app/Http/Livewire/Server/Proxy.php

@@ -2,9 +2,8 @@
 
 namespace App\Http\Livewire\Server;
 
-use App\Actions\Proxy\CheckConfigurationSync;
-use App\Actions\Proxy\SaveConfigurationSync;
-use App\Enums\ProxyTypes;
+use App\Actions\Proxy\CheckConfiguration;
+use App\Actions\Proxy\SaveConfiguration;
 use App\Models\Server;
 use Livewire\Component;
 
@@ -14,14 +13,14 @@ class Proxy extends Component
 
     public ?string $selectedProxy = null;
     public $proxy_settings = null;
-    public string|null $redirect_url = null;
+    public ?string $redirect_url = null;
 
     protected $listeners = ['proxyStatusUpdated', 'saveConfiguration' => 'submit'];
 
     public function mount()
     {
-        $this->selectedProxy = $this->server->proxy->type;
-        $this->redirect_url = $this->server->proxy->redirect_url;
+        $this->selectedProxy = data_get($this->server, 'proxy.type');
+        $this->redirect_url = data_get($this->server, 'proxy.redirect_url');
     }
 
     public function proxyStatusUpdated()
@@ -48,33 +47,32 @@ class Proxy extends Component
     public function submit()
     {
         try {
-            resolve(SaveConfigurationSync::class)($this->server, $this->proxy_settings);
-
+            SaveConfiguration::run($this->server);
             $this->server->proxy->redirect_url = $this->redirect_url;
             $this->server->save();
 
             setup_default_redirect_404(redirect_url: $this->server->proxy->redirect_url, server: $this->server);
             $this->emit('success', 'Proxy configuration saved.');
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e);
+        } catch (\Throwable $e) {
+            return handleError($e);
         }
     }
 
     public function reset_proxy_configuration()
     {
         try {
-            $this->proxy_settings = resolve(CheckConfigurationSync::class)($this->server, true);
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e);
+            $this->proxy_settings = CheckConfiguration::run($this->server, true);
+        } catch (\Throwable $e) {
+            return handleError($e);
         }
     }
 
-    public function load_proxy_configuration()
+    public function loadProxyConfiguration()
     {
         try {
-            $this->proxy_settings = resolve(CheckConfigurationSync::class)($this->server);
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e);
+            $this->proxy_settings = CheckConfiguration::run($this->server);
+        } catch (\Throwable $e) {
+            return handleError($e);
         }
     }
 }

app/Http/Livewire/Server/Proxy/Deploy.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Livewire\Server\Proxy;
 
+use App\Actions\Proxy\SaveConfiguration;
 use App\Actions\Proxy\StartProxy;
 use App\Models\Server;
 use Livewire\Component;
@@ -10,17 +11,27 @@ class Deploy extends Component
 {
     public Server $server;
     public $proxy_settings = null;
+    protected $listeners = ['proxyStatusUpdated'];
 
-    public function start_proxy()
+    public function proxyStatusUpdated()
     {
-        if (
-            $this->server->proxy->last_applied_settings &&
-            $this->server->proxy->last_saved_settings !== $this->server->proxy->last_applied_settings
-        ) {
-            $this->emit('saveConfiguration', $this->server);
+        $this->server->refresh();
+    }
+    public function startProxy()
+    {
+        try {
+            if (
+                $this->server->proxy->last_applied_settings &&
+                $this->server->proxy->last_saved_settings !== $this->server->proxy->last_applied_settings
+            ) {
+                SaveConfiguration::run($this->server);
+            }
+
+            $activity = StartProxy::run($this->server);
+            $this->emit('newMonitorActivity', $activity->id);
+        } catch (\Throwable $e) {
+            return handleError($e);
         }
-        $activity = resolve(StartProxy::class)($this->server);
-        $this->emit('newMonitorActivity', $activity->id);
     }
 
     public function stop()

app/Http/Livewire/Server/Proxy/Modal.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Http\Livewire\Server\Proxy;
+
+use App\Models\Server;
+use Livewire\Component;
+
+class Modal extends Component
+{
+    public Server $server;
+
+    public function proxyStatusUpdated()
+    {
+        $this->emit('proxyStatusUpdated');
+    }
+}

app/Http/Livewire/Server/Proxy/Status.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Livewire\Server\Proxy;
 
-use App\Jobs\ProxyContainerStatusJob;
+use App\Jobs\ContainerStatusJob;
 use App\Models\Server;
 use Livewire\Component;
 
@@ -10,14 +10,25 @@ class Status extends Component
 {
     public Server $server;
 
-    public function get_status()
+    protected $listeners = ['proxyStatusUpdated'];
+    public function proxyStatusUpdated()
     {
-        if (data_get($this->server,'settings.is_usable')) {
-            dispatch_sync(new ProxyContainerStatusJob(
-                server: $this->server
-            ));
-            $this->server->refresh();
-            $this->emit('proxyStatusUpdated');
+        $this->server->refresh();
+    }
+    public function getProxyStatus()
+    {
+        try {
+            if ($this->server->isFunctional()) {
+                dispatch_sync(new ContainerStatusJob($this->server));
+                $this->emit('proxyStatusUpdated');
+            }
+        } catch (\Throwable $e) {
+            return handleError($e);
         }
     }
+    public function getProxyStatusWithNoti()
+    {
+        $this->emit('success', 'Refreshed proxy status.');
+        $this->getProxyStatus();
+    }
 }

app/Http/Livewire/Server/Show.php

@@ -13,9 +13,12 @@ class Show extends Component
     public function mount()
     {
         try {
-            $this->server = Server::ownedByCurrentTeam(['name', 'description', 'ip', 'port', 'user', 'proxy'])->whereUuid(request()->server_uuid)->firstOrFail();
+            $this->server = Server::ownedByCurrentTeam(['name', 'description', 'ip', 'port', 'user', 'proxy'])->whereUuid(request()->server_uuid)->first();
+            if (is_null($this->server)) {
+                return redirect()->route('server.all');
+            }
         } catch (\Throwable $e) {
-            return general_error_handler(err: $e, that: $this);
+            return handleError($e, $this);
         }
     }
     public function render()

app/Http/Livewire/Server/ShowPrivateKey.php

@@ -14,6 +14,7 @@ class ShowPrivateKey extends Component
     public function setPrivateKey($newPrivateKeyId)
     {
         try {
+            refresh_server_connection($this->server->privateKey);
             $oldPrivateKeyId = $this->server->private_key_id;
             $this->server->update([
                 'private_key_id' => $newPrivateKeyId
@@ -21,32 +22,46 @@ class ShowPrivateKey extends Component
             $this->server->refresh();
             refresh_server_connection($this->server->privateKey);
             $this->checkConnection();
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $this->server->update([
                 'private_key_id' => $oldPrivateKeyId
             ]);
             $this->server->refresh();
-             refresh_server_connection($this->server->privateKey);
-            return general_error_handler($e, that: $this);
+            refresh_server_connection($this->server->privateKey);
+            return handleError($e, $this);
         }
     }
 
     public function checkConnection()
     {
         try {
-            ['uptime' => $uptime, 'dockerVersion' => $dockerVersion] = validateServer($this->server);
+            ['uptime' => $uptime, 'dockerVersion' => $dockerVersion] = validateServer($this->server, true);
             if ($uptime) {
+                $this->server->settings->update([
+                    'is_reachable' => true
+                ]);
                 $this->emit('success', 'Server is reachable with this private key.');
             } else {
-                throw new \Exception('Server is not reachable with this private key.');
+                $this->server->settings->update([
+                    'is_reachable' => false,
+                    'is_usable' => false
+                ]);
+                $this->emit('error', 'Server is not reachable with this private key.');
+                return;
             }
             if ($dockerVersion) {
+                $this->server->settings->update([
+                    'is_usable' => true
+                ]);
                 $this->emit('success', 'Server is usable for Coolify.');
             } else {
-                throw new \Exception('Old Docker version detected (lower than 23).');
+                $this->server->settings->update([
+                    'is_usable' => false
+                ]);
+                $this->emit('error', 'Old (lower than 23) or no Docker version detected. Install Docker Engine on the General tab.');
             }
-        } catch (\Exception $e) {
-            throw new \Exception($e->getMessage());
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 

app/Http/Livewire/Settings/Configuration.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Livewire\Settings;
 
-use App\Jobs\ProxyStartJob;
+use App\Jobs\ContainerStatusJob;
 use App\Models\InstanceSettings as ModelsInstanceSettings;
 use App\Models\Server;
 use Livewire\Component;
@@ -124,7 +124,7 @@ class Configuration extends Component
                 ];
             }
             $this->save_configuration_to_disk($traefik_dynamic_conf, $file);
-            dispatch(new ProxyStartJob($this->server));
+            dispatch(new ContainerStatusJob($this->server));
         }
     }
 

app/Http/Livewire/Settings/Email.php

@@ -50,8 +50,8 @@ class Email extends Component
             ]);
             $this->settings->save();
             $this->emit('success', 'Settings saved successfully.');
-        } catch (\Exception $e) {
-            return general_error_handler($e, $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
     public function submitResend() {
@@ -62,17 +62,17 @@ class Email extends Component
             ]);
             $this->settings->save();
             $this->emit('success', 'Settings saved successfully.');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $this->settings->resend_enabled = false;
-            return general_error_handler($e, $this);
+            return handleError($e, $this);
         }
     }
     public function instantSaveResend() {
         try {
             $this->settings->smtp_enabled = false;
             $this->submitResend();
-        } catch (\Exception $e) {
-            return general_error_handler($e, $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
     public function instantSave()
@@ -80,8 +80,8 @@ class Email extends Component
         try {
             $this->settings->resend_enabled = false;
             $this->submit();
-        } catch (\Exception $e) {
-            return general_error_handler($e, $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 
@@ -99,8 +99,8 @@ class Email extends Component
             ]);
             $this->settings->save();
             $this->emit('success', 'Settings saved successfully.');
-        } catch (\Exception $e) {
-            return general_error_handler($e, $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 

app/Http/Livewire/Source/Github/Change.php

@@ -51,8 +51,8 @@ class Change extends Component
         try {
             $this->validate();
             $this->github_app->save();
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e, that: $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 
@@ -65,8 +65,8 @@ class Change extends Component
         try {
             $this->github_app->delete();
             redirect()->route('source.all');
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e, that: $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 }

app/Http/Livewire/Source/Github/Create.php

@@ -49,8 +49,8 @@ class Create extends Component
                 session(['from' => session('from') + ['source_id' => $github_app->id]]);
             }
             redirect()->route('source.github.show', ['github_app_uuid' => $github_app->uuid]);
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e, that: $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 }

app/Http/Livewire/Subscription/Actions.php

@@ -30,8 +30,8 @@ class Actions extends Component
                 $this->emit('success', 'Subscription cancelled successfully. Reloading in 5s.');
                 $this->emit('reloadWindow', 5000);
             }
-        } catch (\Exception $e) {
-            return general_error_handler($e, $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
     public function resume()
@@ -65,8 +65,8 @@ class Actions extends Component
                 $this->emit('success', 'Subscription resumed successfully. Reloading in 5s.');
                 $this->emit('reloadWindow', 5000);
             }
-        } catch (\Exception $e) {
-            return general_error_handler($e, $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
     public function stripeCustomerPortal() {

app/Http/Livewire/Subscription/PricingPlans.php

@@ -8,8 +8,13 @@ use Stripe\Checkout\Session;
 
 class PricingPlans extends Component
 {
+    public bool $isTrial = false;
+    public function mount() {
+        $this->isTrial = !data_get(currentTeam(),'subscription.stripe_trial_already_ended');
+    }
     public function subscribeStripe($type)
     {
+        $team = currentTeam();
         Stripe::setApiKey(config('subscription.stripe_api_key'));
         switch ($type) {
             case 'basic-monthly':
@@ -39,6 +44,7 @@ class PricingPlans extends Component
             return;
         }
         $payload = [
+            'billing_address_collection' => 'required',
             'client_reference_id' => auth()->user()->id . ':' . currentTeam()->id,
             'line_items' => [[
                 'price' => $priceId,
@@ -50,10 +56,23 @@ class PricingPlans extends Component
             'automatic_tax' => [
                 'enabled' => true,
             ],
+
             'mode' => 'subscription',
             'success_url' => route('dashboard', ['success' => true]),
             'cancel_url' => route('subscription.index', ['cancelled' => true]),
         ];
+
+        if (!data_get($team,'subscription.stripe_trial_already_ended')) {
+            $payload['subscription_data'] = [
+                'trial_period_days' => config('constants.limits.trial_period'),
+                'trial_settings' => [
+                    'end_behavior' => [
+                        'missing_payment_method' => 'cancel',
+                    ]
+                ],
+            ];
+            $payload['payment_method_collection'] = 'if_required';
+        }
         $customer = currentTeam()->subscription?->stripe_customer_id ?? null;
         if ($customer) {
             $payload['customer'] = $customer;

app/Http/Livewire/Team/Create.php

@@ -31,8 +31,8 @@ class Create extends Component
             auth()->user()->teams()->attach($team, ['role' => 'admin']);
             refreshSession();
             return redirect()->route('team.index');
-        } catch (\Throwable $th) {
-            return general_error_handler($th, $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 }

app/Http/Livewire/Team/Delete.php

@@ -12,7 +12,6 @@ class Delete extends Component
         $currentTeam = currentTeam();
         $currentTeam->delete();
 
-        $team = auth()->user()->teams()->first();
         $currentTeam->members->each(function ($user) use ($currentTeam) {
             if ($user->id === auth()->user()->id) {
                 return;

app/Http/Livewire/Team/Form.php

@@ -28,8 +28,8 @@ class Form extends Component
         try {
             $this->team->save();
             refreshSession();
-        } catch (\Throwable $th) {
-            return general_error_handler($th, $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 }

app/Http/Livewire/Team/InviteLink.php

@@ -4,9 +4,13 @@ namespace App\Http\Livewire\Team;
 
 use App\Models\TeamInvitation;
 use App\Models\User;
-use App\Notifications\TransactionalEmails\InvitationLink;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Support\Facades\Artisan;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
+use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Str;
 
 class InviteLink extends Component
 {
@@ -20,64 +24,74 @@ class InviteLink extends Component
 
     public function viaEmail()
     {
-        $this->generate_invite_link(isEmail: true);
+        $this->generate_invite_link(sendEmail: true);
     }
 
-    private function generate_invite_link(bool $isEmail = false)
+    public function viaLink()
+    {
+        $this->generate_invite_link(sendEmail: false);
+    }
+    private function generate_invite_link(bool $sendEmail = false)
     {
         try {
-            $uuid = new Cuid2(32);
-            $link = url('/') . config('constants.invitation.link.base_url') . $uuid;
-
-            $user = User::whereEmail($this->email);
-
-            if (!$user->exists()) {
-                return general_error_handler(that: $this, customErrorMessage: "$this->email must be registered first (or activate transactional emails to invite via email).");
-            }
-
             $member_emails = currentTeam()->members()->get()->pluck('email');
             if ($member_emails->contains($this->email)) {
-                return general_error_handler(that: $this, customErrorMessage: "$this->email is already a member of " . currentTeam()->name . ".");
+                return handleError(livewire: $this, customErrorMessage: "$this->email is already a member of " . currentTeam()->name . ".");
             }
+            $uuid = new Cuid2(32);
+            $link = url('/') . config('constants.invitation.link.base_url') . $uuid;
+            $user = User::whereEmail($this->email)->first();
 
-            $invitation = TeamInvitation::whereEmail($this->email);
-
-            if ($invitation->exists()) {
-                $created_at = $invitation->first()->created_at;
-                $diff = $created_at->diffInMinutes(now());
-                if ($diff <= config('constants.invitation.link.expiration')) {
-                    return general_error_handler(that: $this, customErrorMessage: "Invitation already sent to $this->email and waiting for action.");
+            if (is_null($user)) {
+                $password = Str::password();
+                $user = User::create([
+                    'name' => Str::of($this->email)->before('@'),
+                    'email' => $this->email,
+                    'password' => Hash::make($password),
+                    'force_password_reset' => true,
+                ]);
+                $token = Crypt::encryptString("{$user->email}@@@$password");
+                $link = route('auth.link', ['token' => $token]);
+            }
+            $invitation = TeamInvitation::whereEmail($this->email)->first();
+            if (!is_null($invitation)) {
+                $invitationValid = $invitation->isValid();
+                if ($invitationValid) {
+                    return handleError(livewire: $this, customErrorMessage: "Pending invitation already exists for $this->email.");
                 } else {
                     $invitation->delete();
                 }
             }
 
-            TeamInvitation::firstOrCreate([
+            $invitation = TeamInvitation::firstOrCreate([
                 'team_id' => currentTeam()->id,
                 'uuid' => $uuid,
                 'email' => $this->email,
                 'role' => $this->role,
                 'link' => $link,
-                'via' => $isEmail ? 'email' : 'link',
+                'via' => $sendEmail ? 'email' : 'link',
             ]);
-            if ($isEmail) {
-                $user->first()->notify(new InvitationLink);
+            if ($sendEmail) {
+                $mail = new MailMessage();
+                $mail->view('emails.invitation-link', [
+                    'team' => currentTeam()->name,
+                    'invitation_link' => $link,
+                ]);
+                $mail->subject('You have been invited to ' . currentTeam()->name . ' on ' . config('app.name') . '.');
+                send_user_an_email($mail, $this->email);
                 $this->emit('success', 'Invitation sent via email successfully.');
+                $this->emit('refreshInvitations');
+                return;
             } else {
                 $this->emit('success', 'Invitation link generated.');
+                $this->emit('refreshInvitations');
             }
-            $this->emit('refreshInvitations');
         } catch (\Throwable $e) {
             $error_message = $e->getMessage();
             if ($e->getCode() === '23505') {
                 $error_message = 'Invitation already sent.';
             }
-            return general_error_handler(err: $e, that: $this, customErrorMessage: $error_message);
+            return handleError(error: $e, livewire: $this, customErrorMessage: $error_message);
         }
     }
-
-    public function viaLink()
-    {
-        $this->generate_invite_link();
-    }
 }

app/Http/Livewire/Team/Member.php

@@ -3,6 +3,7 @@
 namespace App\Http\Livewire\Team;
 
 use App\Models\User;
+use Illuminate\Support\Facades\Cache;
 use Livewire\Component;
 
 class Member extends Component
@@ -24,6 +25,10 @@ class Member extends Component
     public function remove()
     {
         $this->member->teams()->detach(currentTeam());
+        Cache::forget("team:{$this->member->id}");
+        Cache::remember('team:' . $this->member->id, 3600, function() {
+            return $this->member->teams()->first();
+        });
         $this->emit('reloadWindow');
     }
 }

app/Http/Livewire/Team/Storage/Create.php

@@ -67,8 +67,8 @@ class Create extends Component
             $this->emit('success', 'Connection is working. Tested with "ListObjectsV2" action.');
             $this->storage->save();
             return redirect()->route('team.storages.show', $this->storage->uuid);
-        } catch (\Throwable $th) {
-            return general_error_handler($th, $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 
@@ -77,8 +77,8 @@ class Create extends Component
         try {
             $this->storage->testConnection();
             return $this->emit('success', 'Connection is working. Tested with "ListObjectsV2" action.');
-        } catch (\Throwable $th) {
-            return general_error_handler($th, $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 }

app/Http/Livewire/Team/Storage/Form.php

@@ -32,8 +32,8 @@ class Form extends Component
         try {
             $this->storage->testConnection();
             return $this->emit('success', 'Connection is working. Tested with "ListObjectsV2" action.');
-        } catch (\Throwable $th) {
-            return general_error_handler($th, $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 
@@ -42,8 +42,8 @@ class Form extends Component
         try {
             $this->storage->delete();
             return redirect()->route('team.storages.all');
-        } catch (\Throwable $th) {
-            return general_error_handler($th, $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 
@@ -55,8 +55,8 @@ class Form extends Component
             $this->emit('success', 'Connection is working. Tested with "ListObjectsV2" action.');
             $this->storage->save();
             $this->emit('success', 'Storage settings saved.');
-        } catch (\Throwable $th) {
-            return general_error_handler($th, $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 }

app/Http/Livewire/Upgrade.php

@@ -36,9 +36,9 @@ class Upgrade extends Component
             }
             $this->showProgress = true;
             resolve(UpdateCoolify::class)(true);
-            Toaster::success("Upgrading to {$this->latestVersion} version...");
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e, that: $this);
+            $this->emit('success', "Upgrading to {$this->latestVersion} version...");
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 }

app/Http/Livewire/Waitlist/Index.php

@@ -6,10 +6,12 @@ use App\Jobs\SendConfirmationForWaitlistJob;
 use App\Models\User;
 use App\Models\Waitlist;
 use Livewire\Component;
+use Illuminate\Support\Str;
 
 class Index extends Component
 {
     public string $email;
+    public int $users = 0;
     public int $waitingInLine = 0;
 
     protected $rules = [
@@ -22,6 +24,7 @@ class Index extends Component
     public function mount()
     {
         $this->waitingInLine = Waitlist::whereVerified(true)->count();
+        $this->users = User::count();
         if (isDev()) {
             $this->email = 'waitlist@example.com';
         }
@@ -44,14 +47,14 @@ class Index extends Component
                 return;
             }
             $waitlist = Waitlist::create([
-                'email' => $this->email,
+                'email' => Str::lower($this->email),
                 'type' => 'registration',
             ]);
 
             $this->emit('success', 'Check your email to verify your email address.');
             dispatch(new SendConfirmationForWaitlistJob($this->email, $waitlist->uuid));
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e, that: $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 }

app/Http/Middleware/IsBoardingFlow.php

@@ -5,6 +5,7 @@ namespace App\Http\Middleware;
 use Closure;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Illuminate\Support\Str;
 
 class IsBoardingFlow
 {
@@ -15,8 +16,11 @@ class IsBoardingFlow
      */
     public function handle(Request $request, Closure $next): Response
     {
-        ray()->showQueries()->color('orange');
+        // ray()->showQueries()->color('orange');
         if (showBoarding() && !in_array($request->path(), allowedPathsForBoardingAccounts())) {
+            if (Str::startsWith($request->path(), 'invitations')) {
+                return $next($request);
+            }
             return redirect('boarding');
         }
         return $next($request);

app/Http/Middleware/IsSubscriptionValid.php

@@ -5,6 +5,7 @@ namespace App\Http\Middleware;
 use Closure;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Illuminate\Support\Str;
 
 class IsSubscriptionValid
 {
@@ -31,6 +32,9 @@ class IsSubscriptionValid
         if (!isSubscriptionActive() && !isSubscriptionOnGracePeriod()) {
             // ray('SubscriptionValid Middleware');
             if (!in_array($request->path(), allowedPathsForUnsubscribedAccounts())) {
+                if (Str::startsWith($request->path(), 'invitations')) {
+                    return $next($request);
+                }
                 return redirect('subscription');
             } else {
                 return $next($request);

app/Jobs/ApplicationContainerStatusJob.php

@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Jobs;
-
-use App\Models\Application;
-use App\Models\ApplicationPreview;
-use App\Notifications\Application\StatusChanged;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class ApplicationContainerStatusJob implements ShouldQueue, ShouldBeUnique
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public string $containerName;
-
-    public function __construct(
-        public Application $application,
-        public int $pullRequestId = 0)
-    {
-        $this->containerName = generateApplicationContainerName($application->uuid, $pullRequestId);
-    }
-
-    public function uniqueId(): string
-    {
-        return $this->containerName;
-    }
-
-    public function handle(): void
-    {
-        try {
-            $status = getApplicationContainerStatus(application: $this->application);
-            if ($this->application->status === 'running' && $status !== 'running') {
-                // $this->application->environment->project->team->notify(new StatusChanged($this->application));
-            }
-
-            if ($this->pullRequestId !== 0) {
-                $preview = ApplicationPreview::findPreviewByApplicationAndPullId($this->application->id, $this->pullRequestId);
-                $preview->status = $status;
-                $preview->save();
-            } else {
-                $this->application->status = $status;
-                $this->application->save();
-            }
-        } catch (\Exception $th) {
-            ray($th->getMessage());
-            throw $th;
-        }
-    }
-}

app/Jobs/ApplicationDeploymentJob.php

@@ -17,10 +17,10 @@ use App\Notifications\Application\DeploymentSuccess;
 use App\Traits\ExecuteRemoteCommand;
 use Exception;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\Middleware\WithoutOverlapping;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
@@ -29,7 +29,7 @@ use Symfony\Component\Yaml\Yaml;
 use Throwable;
 use Visus\Cuid2\Cuid2;
 
-class ApplicationDeploymentJob implements ShouldQueue
+class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, ExecuteRemoteCommand;
 
@@ -47,7 +47,6 @@ class ApplicationDeploymentJob implements ShouldQueue
     private GithubApp|GitlabApp $source;
     private StandaloneDocker|SwarmDocker $destination;
     private Server $server;
-    private string $private_key_location;
     private ApplicationPreview|null $preview = null;
 
     private string $container_name;
@@ -90,7 +89,7 @@ class ApplicationDeploymentJob implements ShouldQueue
         $this->is_debug_enabled = $this->application->settings->is_debug_enabled;
 
         $this->container_name = generateApplicationContainerName($this->application->uuid, $this->pull_request_id);
-        $this->private_key_location = save_private_key_for_server($this->server);
+        savePrivateKeyToFs($this->server);
         $this->saved_outputs = collect();
 
         // Set preview fqdn
@@ -120,6 +119,9 @@ class ApplicationDeploymentJob implements ShouldQueue
         if ($containers->count() > 0) {
             $this->currently_running_container_name = data_get($containers[0], 'Names');
         }
+        if ($this->pull_request_id !== 0 && $this->pull_request_id !== null) {
+            $this->currently_running_container_name = $this->container_name;
+        }
         $this->application_deployment_queue->update([
             'status' => ApplicationDeploymentStatus::IN_PROGRESS->value,
         ]);
@@ -133,7 +135,9 @@ class ApplicationDeploymentJob implements ShouldQueue
                     $this->deploy();
                 }
             }
-            if ($this->application->fqdn) dispatch(new ProxyStartJob($this->server));
+            if ($this->server->isProxyShouldRun()) {
+                dispatch(new ContainerStatusJob($this->server));
+            }
             $this->next(ApplicationDeploymentStatus::FINISHED->value);
         } catch (Exception $e) {
             ray($e);
@@ -173,7 +177,7 @@ class ApplicationDeploymentJob implements ShouldQueue
         $this->prepare_builder_image();
         $this->execute_remote_command(
             [
-                $this->execute_in_builder("echo '$dockerfile_base64' | base64 -d > $this->workdir/Dockerfile")
+                executeInDocker($this->deployment_uuid, "echo '$dockerfile_base64' | base64 -d > $this->workdir/Dockerfile")
             ],
         );
         $this->build_image_name = Str::lower("{$this->application->git_repository}:build");
@@ -268,6 +272,7 @@ class ApplicationDeploymentJob implements ShouldQueue
                             "echo 'Rolling update completed.'"
                         ],
                     );
+                    $this->application->update(['status' => 'running']);
                     break;
                 }
                 $counter++;
@@ -294,7 +299,11 @@ class ApplicationDeploymentJob implements ShouldQueue
         // $this->generate_build_env_variables();
         // $this->add_build_env_variables_to_dockerfile();
         $this->build_image();
-        $this->rolling_update();
+        $this->stop_running_container();
+        $this->execute_remote_command(
+            ["echo -n 'Starting preview deployment.'"],
+            [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up -d >/dev/null"), "hidden" => true],
+        );
     }
 
     private function prepare_builder_image()
@@ -315,16 +324,12 @@ class ApplicationDeploymentJob implements ShouldQueue
                 "hidden" => true,
             ],
             [
-                "command" => $this->execute_in_builder("mkdir -p {$this->workdir}")
+                "command" => executeInDocker($this->deployment_uuid, "mkdir -p {$this->workdir}")
             ],
         );
     }
 
-    private function execute_in_builder(string $command)
-    {
-        return "docker exec {$this->deployment_uuid} bash -c '{$command}'";
-        // return "docker exec {$this->deployment_uuid} bash -c '{$command} |& tee -a /proc/1/fd/1; [ \$PIPESTATUS -eq 0 ] || exit \$PIPESTATUS'";
-    }
+
 
     private function clone_repository()
     {
@@ -336,7 +341,7 @@ class ApplicationDeploymentJob implements ShouldQueue
                 $this->importing_git_repository()
             ],
             [
-                $this->execute_in_builder("cd {$this->workdir} && git rev-parse HEAD"),
+                executeInDocker($this->deployment_uuid, "cd {$this->workdir} && git rev-parse HEAD"),
                 "hidden" => true,
                 "save" => "git_commit_sha"
             ],
@@ -363,13 +368,13 @@ class ApplicationDeploymentJob implements ShouldQueue
                     $git_clone_command = "{$git_clone_command} {$this->source->html_url}/{$this->application->git_repository} {$this->workdir}";
                     $git_clone_command = $this->set_git_import_settings($git_clone_command);
 
-                    $commands->push($this->execute_in_builder($git_clone_command));
+                    $commands->push(executeInDocker($this->deployment_uuid, $git_clone_command));
                 } else {
                     $github_access_token = generate_github_installation_token($this->source);
-                    $commands->push($this->execute_in_builder("git clone -q -b {$this->application->git_branch} $source_html_url_scheme://x-access-token:$github_access_token@$source_html_url_host/{$this->application->git_repository}.git {$this->workdir}"));
+                    $commands->push(executeInDocker($this->deployment_uuid, "git clone -q -b {$this->application->git_branch} $source_html_url_scheme://x-access-token:$github_access_token@$source_html_url_host/{$this->application->git_repository}.git {$this->workdir}"));
                 }
                 if ($this->pull_request_id !== 0) {
-                    $commands->push($this->execute_in_builder("cd {$this->workdir} && git fetch origin pull/{$this->pull_request_id}/head:$pr_branch_name && git checkout $pr_branch_name"));
+                    $commands->push(executeInDocker($this->deployment_uuid, "cd {$this->workdir} && git fetch origin pull/{$this->pull_request_id}/head:$pr_branch_name && git checkout $pr_branch_name"));
                 }
                 return $commands->implode(' && ');
             }
@@ -379,10 +384,10 @@ class ApplicationDeploymentJob implements ShouldQueue
             $git_clone_command = "GIT_SSH_COMMAND=\"ssh -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" {$git_clone_command} {$this->application->git_full_url} {$this->workdir}";
             $git_clone_command = $this->set_git_import_settings($git_clone_command);
             $commands = collect([
-                $this->execute_in_builder("mkdir -p /root/.ssh"),
-                $this->execute_in_builder("echo '{$private_key}' | base64 -d > /root/.ssh/id_rsa"),
-                $this->execute_in_builder("chmod 600 /root/.ssh/id_rsa"),
-                $this->execute_in_builder($git_clone_command)
+                executeInDocker($this->deployment_uuid, "mkdir -p /root/.ssh"),
+                executeInDocker($this->deployment_uuid, "echo '{$private_key}' | base64 -d > /root/.ssh/id_rsa"),
+                executeInDocker($this->deployment_uuid, "chmod 600 /root/.ssh/id_rsa"),
+                executeInDocker($this->deployment_uuid, $git_clone_command)
             ]);
             return $commands->implode(' && ');
         }
@@ -405,7 +410,7 @@ class ApplicationDeploymentJob implements ShouldQueue
     private function cleanup_git()
     {
         $this->execute_remote_command(
-            [$this->execute_in_builder("rm -fr {$this->workdir}/.git")],
+            [executeInDocker($this->deployment_uuid, "rm -fr {$this->workdir}/.git")],
         );
     }
 
@@ -416,8 +421,8 @@ class ApplicationDeploymentJob implements ShouldQueue
                 "echo -n 'Generating nixpacks configuration.'",
             ],
             [$this->nixpacks_build_cmd()],
-            [$this->execute_in_builder("cp {$this->workdir}/.nixpacks/Dockerfile {$this->workdir}/Dockerfile")],
-            [$this->execute_in_builder("rm -f {$this->workdir}/.nixpacks/Dockerfile")]
+            [executeInDocker($this->deployment_uuid, "cp {$this->workdir}/.nixpacks/Dockerfile {$this->workdir}/Dockerfile")],
+            [executeInDocker($this->deployment_uuid, "rm -f {$this->workdir}/.nixpacks/Dockerfile")]
         );
     }
 
@@ -435,7 +440,7 @@ class ApplicationDeploymentJob implements ShouldQueue
             $nixpacks_command .= " --install-cmd \"{$this->application->install_command}\"";
         }
         $nixpacks_command .= " {$this->workdir}";
-        return $this->execute_in_builder($nixpacks_command);
+        return executeInDocker($this->deployment_uuid, $nixpacks_command);
     }
 
     private function generate_env_variables()
@@ -498,7 +503,7 @@ class ApplicationDeploymentJob implements ShouldQueue
                 $this->destination->network => [
                     'external' => true,
                     'name' => $this->destination->network,
-                    'attachable' => true,
+                    'attachable' => true
                 ]
             ]
         ];
@@ -513,7 +518,7 @@ class ApplicationDeploymentJob implements ShouldQueue
         }
         $this->docker_compose = Yaml::dump($docker_compose, 10);
         $this->docker_compose_base64 = base64_encode($this->docker_compose);
-        $this->execute_remote_command([$this->execute_in_builder("echo '{$this->docker_compose_base64}' | base64 -d > {$this->workdir}/docker-compose.yml"), "hidden" => true]);
+        $this->execute_remote_command([executeInDocker($this->deployment_uuid, "echo '{$this->docker_compose_base64}' | base64 -d > {$this->workdir}/docker-compose.yml"), "hidden" => true]);
     }
 
     private function generate_local_persistent_volumes()
@@ -574,10 +579,15 @@ class ApplicationDeploymentJob implements ShouldQueue
 
     private function set_labels_for_applications()
     {
+
+        $appId = $this->application->id;
+        if ($this->pull_request_id !== 0) {
+            $appId = $appId . '-pr-' . $this->pull_request_id;
+        }
         $labels = [];
         $labels[] = 'coolify.managed=true';
         $labels[] = 'coolify.version=' . config('version');
-        $labels[] = 'coolify.applicationId=' . $this->application->id;
+        $labels[] = 'coolify.applicationId=' . $appId;
         $labels[] = 'coolify.type=application';
         $labels[] = 'coolify.name=' . $this->application->name;
         if ($this->pull_request_id !== 0) {
@@ -638,6 +648,10 @@ class ApplicationDeploymentJob implements ShouldQueue
 
     private function generate_healthcheck_commands()
     {
+        if ($this->application->dockerfile || $this->application->build_pack === 'dockerfile') {
+            // TODO: disabled HC because there are several ways to hc a simple docker image, hard to figure out a good way. Like some docker images (pocketbase) does not have curl.
+            return 'exit 0';
+        }
         if (!$this->application->health_check_port) {
             $this->application->health_check_port = $this->application->ports_exposes_array[0];
         }
@@ -661,7 +675,7 @@ class ApplicationDeploymentJob implements ShouldQueue
 
         if ($this->application->settings->is_static) {
             $this->execute_remote_command([
-                $this->execute_in_builder("docker build --network host -f {$this->workdir}/Dockerfile {$this->build_args} --progress plain -t $this->build_image_name {$this->workdir}"), "hidden" => true
+                executeInDocker($this->deployment_uuid, "docker build --network host -f {$this->workdir}/Dockerfile {$this->build_args} --progress plain -t $this->build_image_name {$this->workdir}"), "hidden" => true
             ]);
 
             $dockerfile = base64_encode("FROM {$this->application->static_image}
@@ -688,18 +702,18 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
             }");
             $this->execute_remote_command(
                 [
-                    $this->execute_in_builder("echo '{$dockerfile}' | base64 -d > {$this->workdir}/Dockerfile-prod")
+                    executeInDocker($this->deployment_uuid, "echo '{$dockerfile}' | base64 -d > {$this->workdir}/Dockerfile-prod")
                 ],
                 [
-                    $this->execute_in_builder("echo '{$nginx_config}' | base64 -d > {$this->workdir}/nginx.conf")
+                    executeInDocker($this->deployment_uuid, "echo '{$nginx_config}' | base64 -d > {$this->workdir}/nginx.conf")
                 ],
                 [
-                    $this->execute_in_builder("docker build --network host -f {$this->workdir}/Dockerfile-prod {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
+                    executeInDocker($this->deployment_uuid, "docker build --network host -f {$this->workdir}/Dockerfile-prod {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
                 ]
             );
         } else {
             $this->execute_remote_command([
-                $this->execute_in_builder("docker build --network host -f {$this->workdir}/Dockerfile {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
+                executeInDocker($this->deployment_uuid, "docker build --network host -f {$this->workdir}/Dockerfile {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
             ]);
         }
     }
@@ -709,7 +723,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
         if ($this->currently_running_container_name) {
             $this->execute_remote_command(
                 ["echo -n 'Removing old version of your application.'"],
-                [$this->execute_in_builder("docker rm -f $this->currently_running_container_name >/dev/null 2>&1"), "hidden" => true],
+                [executeInDocker($this->deployment_uuid, "docker rm -f $this->currently_running_container_name >/dev/null 2>&1"), "hidden" => true],
             );
         }
     }
@@ -718,7 +732,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
     {
         $this->execute_remote_command(
             ["echo -n 'Rolling update started.'"],
-            [$this->execute_in_builder("docker compose --project-directory {$this->workdir} up -d >/dev/null"), "hidden" => true],
+            [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up -d >/dev/null"), "hidden" => true],
         );
     }
 
@@ -741,7 +755,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
     private function add_build_env_variables_to_dockerfile()
     {
         $this->execute_remote_command([
-            $this->execute_in_builder("cat {$this->workdir}/Dockerfile"), "hidden" => true, "save" => 'dockerfile'
+            executeInDocker($this->deployment_uuid, "cat {$this->workdir}/Dockerfile"), "hidden" => true, "save" => 'dockerfile'
         ]);
         $dockerfile = collect(Str::of($this->saved_outputs->get('dockerfile'))->trim()->explode("\n"));
 
@@ -750,7 +764,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
         }
         $dockerfile_base64 = base64_encode($dockerfile->implode("\n"));
         $this->execute_remote_command([
-            $this->execute_in_builder("echo '{$dockerfile_base64}' | base64 -d > {$this->workdir}/Dockerfile"),
+            executeInDocker($this->deployment_uuid, "echo '{$dockerfile_base64}' | base64 -d > {$this->workdir}/Dockerfile"),
             "hidden" => true
         ]);
     }

app/Jobs/ApplicationPullRequestUpdateJob.php

@@ -6,12 +6,13 @@ use App\Enums\ProcessStatus;
 use App\Models\Application;
 use App\Models\ApplicationPreview;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
-class ApplicationPullRequestUpdateJob implements ShouldQueue
+class ApplicationPullRequestUpdateJob implements ShouldQueue, ShouldBeEncrypted
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
@@ -57,7 +58,7 @@ class ApplicationPullRequestUpdateJob implements ShouldQueue
             } else {
                 $this->create_comment();
             }
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             ray($e);
             throw $e;
         }

app/Jobs/CheckResaleLicenseJob.php

@@ -4,12 +4,13 @@ namespace App\Jobs;
 
 use App\Actions\License\CheckResaleLicense;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
-class CheckResaleLicenseJob implements ShouldQueue
+class CheckResaleLicenseJob implements ShouldQueue, ShouldBeEncrypted
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
@@ -21,10 +22,10 @@ class CheckResaleLicenseJob implements ShouldQueue
     {
         try {
             resolve(CheckResaleLicense::class)();
-        } catch (\Throwable $th) {
-            send_internal_notification('CheckResaleLicenseJob failed with: ' . $th->getMessage());
-            ray($th);
-            throw $th;
+        } catch (\Throwable $e) {
+            send_internal_notification('CheckResaleLicenseJob failed with: ' . $e->getMessage());
+            ray($e);
+            throw $e;
         }
     }
 }

app/Jobs/CleanupInstanceStuffsJob.php

@@ -2,15 +2,17 @@
 
 namespace App\Jobs;
 
+use App\Models\TeamInvitation;
 use App\Models\Waitlist;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
-class CleanupInstanceStuffsJob implements ShouldQueue, ShouldBeUnique
+class CleanupInstanceStuffsJob implements ShouldQueue, ShouldBeUnique, ShouldBeEncrypted
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
@@ -27,11 +29,16 @@ class CleanupInstanceStuffsJob implements ShouldQueue, ShouldBeUnique
     public function handle(): void
     {
         try {
-            $this->cleanup_waitlist();
-        } catch (\Exception $e) {
+            // $this->cleanup_waitlist();
+        } catch (\Throwable $e) {
+            send_internal_notification('CleanupInstanceStuffsJob failed with error: ' . $e->getMessage());
+            ray($e->getMessage());
+        }
+        try {
+            $this->cleanup_invitation_link();
+        } catch (\Throwable $e) {
             send_internal_notification('CleanupInstanceStuffsJob failed with error: ' . $e->getMessage());
             ray($e->getMessage());
-            throw $e;
         }
     }
 
@@ -42,4 +49,11 @@ class CleanupInstanceStuffsJob implements ShouldQueue, ShouldBeUnique
             $item->delete();
         }
     }
+    private function cleanup_invitation_link()
+    {
+        $invitation = TeamInvitation::all();
+        foreach ($invitation as $item) {
+            $item->isValid();
+        }
+    }
 }

app/Jobs/ContainerStatusJob.php

@@ -0,0 +1,206 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Actions\Proxy\StartProxy;
+use App\Models\ApplicationPreview;
+use App\Models\Server;
+use App\Notifications\Container\ContainerRestarted;
+use App\Notifications\Container\ContainerStopped;
+use App\Notifications\Server\Unreachable;
+use Arr;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Str;
+
+class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $tries = 1;
+    public $timeout = 120;
+
+    public function __construct(public Server $server)
+    {
+    }
+
+    public function middleware(): array
+    {
+        return [new WithoutOverlapping($this->server->uuid)];
+    }
+
+    public function uniqueId(): string
+    {
+        return $this->server->uuid;
+    }
+
+    private function checkServerConnection()
+    {
+        $uptime = instant_remote_process(['uptime'], $this->server, false);
+        if (!is_null($uptime)) {
+            return true;
+        }
+    }
+    public function handle(): void
+    {
+        try {
+            // ray()->clearAll();
+            $serverUptimeCheckNumber = 0;
+            $serverUptimeCheckNumberMax = 3;
+            while (true) {
+                if ($serverUptimeCheckNumber >= $serverUptimeCheckNumberMax) {
+                    $this->server->settings()->update(['is_reachable' => false]);
+                    $this->server->team->notify(new Unreachable($this->server));
+                    return;
+                }
+                $result = $this->checkServerConnection();
+                if ($result) {
+                    break;
+                }
+                $serverUptimeCheckNumber++;
+                sleep(5);
+            }
+            $containers = instant_remote_process(["docker container ls -q"], $this->server);
+            if (!$containers) {
+                return;
+            }
+            $containers = instant_remote_process(["docker container inspect $(docker container ls -q) --format '{{json .}}'"], $this->server);
+            $containers = format_docker_command_output_to_json($containers);
+            $applications = $this->server->applications();
+            $databases = $this->server->databases();
+            $previews = $this->server->previews();
+
+            /// Check if proxy is running
+            $foundProxyContainer = $containers->filter(function ($value, $key) {
+                return data_get($value, 'Name') === '/coolify-proxy';
+            })->first();
+            if (!$foundProxyContainer) {
+                if ($this->server->isProxyShouldRun()) {
+                    StartProxy::run($this->server, false);
+                    $this->server->team->notify(new ContainerRestarted('coolify-proxy', $this->server));
+                }
+            } else {
+                $this->server->proxy->status = data_get($foundProxyContainer, 'State.Status');
+                $this->server->save();
+            }
+            $foundApplications = [];
+            $foundApplicationPreviews = [];
+            $foundDatabases = [];
+            foreach ($containers as $container) {
+                $containerStatus = data_get($container, 'State.Status');
+                $labels = data_get($container, 'Config.Labels');
+                $labels = Arr::undot(format_docker_labels_to_json($labels));
+                $labelId = data_get($labels, 'coolify.applicationId');
+                if ($labelId) {
+                    if (str_contains($labelId, '-pr-')) {
+                        $previewId = (int) Str::after($labelId, '-pr-');
+                        $applicationId = (int) Str::before($labelId, '-pr-');
+                        $preview = ApplicationPreview::where('application_id', $applicationId)->where('pull_request_id', $previewId)->first();
+                        if ($preview) {
+                            $foundApplicationPreviews[] = $preview->id;
+                            $statusFromDb = $preview->status;
+                            if ($statusFromDb !== $containerStatus) {
+                                $preview->update(['status' => $containerStatus]);
+                            }
+                        } else {
+                            //Notify user that this container should not be there.
+                        }
+                    } else {
+                        $application = $applications->where('id', $labelId)->first();
+                        if ($application) {
+                            $foundApplications[] = $application->id;
+                            $statusFromDb = $application->status;
+                            if ($statusFromDb !== $containerStatus) {
+                                $application->update(['status' => $containerStatus]);
+                            }
+                        } else {
+                            //Notify user that this container should not be there.
+                        }
+                    }
+                } else {
+                    $uuid = data_get($labels, 'com.docker.compose.service');
+                    if ($uuid) {
+                        $database = $databases->where('uuid', $uuid)->first();
+                        if ($database) {
+                            $foundDatabases[] = $database->id;
+                            $statusFromDb = $database->status;
+                            if ($statusFromDb !== $containerStatus) {
+                                $database->update(['status' => $containerStatus]);
+                            }
+                        } else {
+                            // Notify user that this container should not be there.
+                        }
+                    }
+                }
+            }
+            $notRunningApplications = $applications->pluck('id')->diff($foundApplications);
+            foreach ($notRunningApplications as $applicationId) {
+                $application = $applications->where('id', $applicationId)->first();
+                if ($application->status === 'exited') {
+                    continue;
+                }
+                $application->update(['status' => 'exited']);
+
+                $name = data_get($application, 'name');
+                $fqdn = data_get($application, 'fqdn');
+
+                $containerName = $name ? "$name ($fqdn)" : $fqdn;
+
+                $project = data_get($application, 'environment.project');
+                $environment = data_get($application, 'environment');
+
+                $url =  base_url() . '/project/' . $project->uuid . "/" . $environment->name . "/application/" . $application->uuid;
+
+                $this->server->team->notify(new ContainerStopped($containerName, $this->server, $url));
+            }
+            $notRunningApplicationPreviews = $previews->pluck('id')->diff($foundApplicationPreviews);
+            foreach ($notRunningApplicationPreviews as $previewId) {
+                $preview = $previews->where('id', $previewId)->first();
+                if ($preview->status === 'exited') {
+                    continue;
+                }
+                $preview->update(['status' => 'exited']);
+
+                $name = data_get($preview, 'name');
+                $fqdn = data_get($preview, 'fqdn');
+
+                $containerName = $name ? "$name ($fqdn)" : $fqdn;
+
+                $project = data_get($preview, 'application.environment.project');
+                $environment = data_get($preview, 'application.environment');
+
+                $url =  base_url() . '/project/' . $project->uuid . "/" . $environment->name . "/application/" . $preview->application->uuid;
+                $this->server->team->notify(new ContainerStopped($containerName, $this->server, $url));
+            }
+            $notRunningDatabases = $databases->pluck('id')->diff($foundDatabases);
+            foreach ($notRunningDatabases as $database) {
+                $database = $databases->where('id', $database)->first();
+                if ($database->status === 'exited') {
+                    continue;
+                }
+                $database->update(['status' => 'exited']);
+
+                $name = data_get($database, 'name');
+                $fqdn = data_get($database, 'fqdn');
+
+                $containerName = $name;
+
+                $project = data_get($database, 'environment.project');
+                $environment = data_get($database, 'environment');
+
+                $url =  base_url() . '/project/' . $project->uuid . "/" . $environment->name . "/database/" . $database->uuid;
+                $this->server->team->notify(new ContainerStopped($containerName, $this->server, $url));
+            }
+        } catch (\Throwable $e) {
+            send_internal_notification('ContainerStatusJob failed with: ' . $e->getMessage());
+            ray($e->getMessage());
+            throw $e;
+        }
+    }
+}

app/Jobs/CoolifyTask.php

@@ -4,13 +4,14 @@ namespace App\Jobs;
 
 use App\Actions\CoolifyTask\RunRemoteProcess;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Spatie\Activitylog\Models\Activity;
 
-class CoolifyTask implements ShouldQueue
+class CoolifyTask implements ShouldQueue, ShouldBeEncrypted
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 

app/Jobs/DatabaseBackupJob.php

@@ -12,15 +12,15 @@ use App\Notifications\Database\BackupFailed;
 use App\Notifications\Database\BackupSuccess;
 use Carbon\Carbon;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\Middleware\WithoutOverlapping;
 use Illuminate\Queue\SerializesModels;
-use Throwable;
 use Illuminate\Support\Str;
 
-class DatabaseBackupJob implements ShouldQueue
+class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
@@ -90,10 +90,10 @@ class DatabaseBackupJob implements ShouldQueue
             }
             $this->save_backup_logs();
             // TODO: Notify user
-        } catch (\Throwable $th) {
-            ray($th->getMessage());
-            send_internal_notification('DatabaseBackupJob failed with: ' . $th->getMessage());
-            throw $th;
+        } catch (\Throwable $e) {
+            ray($e->getMessage());
+            send_internal_notification('DatabaseBackupJob failed with: ' . $e->getMessage());
+            throw $e;
         }
     }
 
@@ -116,10 +116,10 @@ class DatabaseBackupJob implements ShouldQueue
 
             $this->backup_status = 'success';
             $this->team->notify(new BackupSuccess($this->backup, $this->database));
-        } catch (Throwable $th) {
+        } catch (\Throwable $e) {
             $this->backup_status = 'failed';
-            $this->add_to_backup_output($th->getMessage());
-            ray('Backup failed for ' . $this->container_name . ' at ' . $this->server->name . ':' . $this->backup_location . '\n\nError:' . $th->getMessage());
+            $this->add_to_backup_output($e->getMessage());
+            ray('Backup failed for ' . $this->container_name . ' at ' . $this->server->name . ':' . $this->backup_location . '\n\nError:' . $e->getMessage());
             $this->team->notify(new BackupFailed($this->backup, $this->database, $this->backup_output));
         } finally {
             $this->backup_log->update([
@@ -173,9 +173,9 @@ class DatabaseBackupJob implements ShouldQueue
             instant_remote_process($commands, $this->server);
             $this->add_to_backup_output('Uploaded to S3.');
             ray('Uploaded to S3. ' . $this->backup_location . ' to s3://' . $bucket . $this->backup_dir);
-        } catch (\Throwable $th) {
-            $this->add_to_backup_output($th->getMessage());
-            ray($th->getMessage());
+        } catch (\Throwable $e) {
+            $this->add_to_backup_output($e->getMessage());
+            ray($e->getMessage());
         } finally {
             $command = "docker rm -f backup-of-{$this->backup->uuid}";
             instant_remote_process([$command], $this->server);

app/Jobs/DatabaseContainerStatusJob.php

@@ -1,56 +0,0 @@
-<?php
-
-namespace App\Jobs;
-
-use App\Models\ApplicationPreview;
-use App\Models\StandalonePostgresql;
-use App\Notifications\Application\StatusChanged;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class DatabaseContainerStatusJob implements ShouldQueue, ShouldBeUnique
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public string $containerName;
-
-    public function __construct(
-        public StandalonePostgresql $database,
-    ) {
-        $this->containerName = $database->uuid;
-    }
-
-    public function uniqueId(): string
-    {
-        return $this->containerName;
-    }
-
-    public function handle(): void
-    {
-        try {
-            $status = getContainerStatus(
-                server: $this->database->destination->server,
-                container_id: $this->containerName,
-                throwError: false
-            );
-
-            if ($this->database->status === 'running' && $status !== 'running') {
-                if (data_get($this->database, 'environment.project.team')) {
-                    // $this->database->environment->project->team->notify(new StatusChanged($this->database));
-                }
-            }
-            if ($this->database->status !== $status) {
-                $this->database->status = $status;
-                $this->database->save();
-            }
-        } catch (\Exception $e) {
-            send_internal_notification('DatabaseContainerStatusJob failed with: ' . $e->getMessage());
-            ray($e->getMessage());
-            throw $e;
-        }
-    }
-}

app/Jobs/DockerCleanupJob.php

@@ -5,13 +5,14 @@ namespace App\Jobs;
 use App\Models\ApplicationDeploymentQueue;
 use App\Models\Server;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\Middleware\WithoutOverlapping;
 use Illuminate\Queue\SerializesModels;
 
-class DockerCleanupJob implements ShouldQueue
+class DockerCleanupJob implements ShouldQueue, ShouldBeEncrypted
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
@@ -36,11 +37,11 @@ class DockerCleanupJob implements ShouldQueue
             return;
         }
         try {
-            ray()->showQueries()->color('orange');
+            // ray()->showQueries()->color('orange');
             $servers = Server::all();
             foreach ($servers as $server) {
                 if (
-                    !$server->settings->is_reachable && !$server->settings->is_usable
+                    !$server->isFunctional()
                 ) {
                     continue;
                 }
@@ -75,7 +76,7 @@ class DockerCleanupJob implements ShouldQueue
                     ray('No need to clean up ' . $server->name)->color('orange');
                 }
             }
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             send_internal_notification('DockerCleanupJob failed with: ' . $e->getMessage());
             ray($e->getMessage())->color('orange');
             throw $e;

app/Jobs/InstanceAutoUpdateJob.php

@@ -4,13 +4,14 @@ namespace App\Jobs;
 
 use App\Actions\Server\UpdateCoolify;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
-class InstanceAutoUpdateJob implements ShouldQueue, ShouldBeUnique
+class InstanceAutoUpdateJob implements ShouldQueue, ShouldBeUnique, ShouldBeEncrypted
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 

app/Jobs/ProxyCheckJob.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Jobs;
-
-use App\Actions\Proxy\StartProxy;
-use App\Models\Server;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class ProxyCheckJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public function __construct()
-    {
-    }
-
-    public function handle()
-    {
-        try {
-            $container_name = 'coolify-proxy';
-            $servers = Server::all();
-            foreach ($servers as $server) {
-                if (
-                    $server->settings->is_reachable === false || $server->settings->is_usable === false
-                ) {
-                    continue;
-                }
-                $status = getContainerStatus(server: $server, container_id: $container_name);
-                if ($status === 'running') {
-                    continue;
-                }
-                if (data_get($server, 'proxy.type')) {
-                    resolve(StartProxy::class)($server);
-                }
-            }
-        } catch (\Throwable $th) {
-            ray($th->getMessage());
-            send_internal_notification('ProxyCheckJob failed with: ' . $th->getMessage());
-            throw $th;
-        }
-    }
-}

app/Jobs/ProxyContainerStatusJob.php

@@ -1,65 +0,0 @@
-<?php
-
-namespace App\Jobs;
-
-use App\Enums\ProxyTypes;
-use App\Models\Server;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\Middleware\WithoutOverlapping;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Str;
-
-class ProxyContainerStatusJob implements ShouldQueue, ShouldBeUnique
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public Server $server;
-    public $tries = 1;
-    public $timeout = 120;
-
-    public function __construct(Server $server)
-    {
-        $this->server = $server;
-    }
-
-    public function middleware(): array
-    {
-        return [new WithoutOverlapping($this->server->id)];
-    }
-
-    public function uniqueId(): int
-    {
-        return $this->server->id;
-    }
-
-    public function handle(): void
-    {
-        try {
-            $container = getContainerStatus(server: $this->server, all_data: true, container_id: 'coolify-proxy', throwError: false);
-            $status = data_get($container, 'State.Status');
-            if ($status && data_get($this->server, 'proxy.status') !== $status) {
-                $this->server->proxy->status = $status;
-                if ($this->server->proxy->status === 'running') {
-                    $traefik = $container['Config']['Labels']['org.opencontainers.image.title'];
-                    $version = $container['Config']['Labels']['org.opencontainers.image.version'];
-                    if (isset($version) && isset($traefik) && $traefik === 'Traefik' && Str::of($version)->startsWith('v2')) {
-                        $this->server->proxy->type = ProxyTypes::TRAEFIK_V2->value;
-                    }
-                }
-                $this->server->save();
-            }
-        } catch (\Exception $e) {
-            if ($e->getCode() === 1) {
-                $this->server->proxy->status = 'exited';
-                $this->server->save();
-            }
-            send_internal_notification('ProxyContainerStatusJob failed with: ' . $e->getMessage());
-            ray($e->getMessage());
-            throw $e;
-        }
-    }
-}

app/Jobs/ProxyStartJob.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace App\Jobs;
-
-use App\Actions\Proxy\StartProxy;
-use App\Enums\ProxyStatus;
-use App\Enums\ProxyTypes;
-use App\Models\Server;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class ProxyStartJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public function __construct(protected Server $server)
-    {
-    }
-
-    public function handle()
-    {
-        try {
-            $container_name = 'coolify-proxy';
-            ray('Starting proxy for server: ' . $this->server->name);
-            $status = getContainerStatus(server: $this->server, container_id: $container_name);
-            if ($status === 'running') {
-                return;
-            }
-            if (is_null(data_get($this->server, 'proxy.type'))) {
-                $this->server->proxy->type = ProxyTypes::TRAEFIK_V2->value;
-                $this->server->proxy->status = ProxyStatus::EXITED->value;
-                $this->server->save();
-            }
-            resolve(StartProxy::class)($this->server);
-        } catch (\Throwable $th) {
-            send_internal_notification('ProxyStartJob failed with: ' . $th->getMessage());
-            ray($th->getMessage());
-            throw $th;
-        }
-    }
-}

app/Jobs/ResourceStatusJob.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Jobs;
-
-use App\Models\Application;
-use App\Models\StandalonePostgresql;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class ResourceStatusJob implements ShouldQueue, ShouldBeUnique
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public $applications;
-    public $postgresqls;
-
-    public function __construct()
-    {
-        $this->applications = Application::all();
-        $this->postgresqls = StandalonePostgresql::all();
-    }
-
-    public function handle(): void
-    {
-        try {
-            foreach ($this->applications as $application) {
-                dispatch(new ApplicationContainerStatusJob(
-                    application: $application,
-                ));
-            }
-            foreach ($this->postgresqls as $postgresql) {
-                dispatch(new DatabaseContainerStatusJob(
-                    database: $postgresql,
-                ));
-            }
-        } catch (\Exception $th) {
-            send_internal_notification('ResourceStatusJob failed with: ' . $th->getMessage());
-            ray($th);
-            throw $th;
-        }
-    }
-}

app/Jobs/SendConfirmationForWaitlistJob.php

@@ -5,6 +5,7 @@ namespace App\Jobs;
 use App\Models\InstanceSettings;
 use App\Models\Waitlist;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Mail\Message;
@@ -13,7 +14,7 @@ use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Mail;
 
-class SendConfirmationForWaitlistJob implements ShouldQueue
+class SendConfirmationForWaitlistJob implements ShouldQueue, ShouldBeEncrypted
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
@@ -25,10 +26,8 @@ class SendConfirmationForWaitlistJob implements ShouldQueue
     {
         try {
             $mail = new MailMessage();
-
             $confirmation_url = base_url() . '/webhooks/waitlist/confirm?email=' . $this->email . '&confirmation_code=' . $this->uuid;
             $cancel_url = base_url() . '/webhooks/waitlist/cancel?email=' . $this->email . '&confirmation_code=' . $this->uuid;
-
             $mail->view('emails.waitlist-confirmation',
                 [
                     'confirmation_url' => $confirmation_url,
@@ -36,10 +35,10 @@ class SendConfirmationForWaitlistJob implements ShouldQueue
                 ]);
             $mail->subject('You are on the waitlist!');
             send_user_an_email($mail, $this->email);
-        } catch (\Throwable $th) {
-            send_internal_notification("SendConfirmationForWaitlistJob failed for {$mail} with error: " . $th->getMessage());
-            ray($th->getMessage());
-            throw $th;
+        } catch (\Throwable $e) {
+            send_internal_notification("SendConfirmationForWaitlistJob failed for {$this->email} with error: " . $e->getMessage());
+            ray($e->getMessage());
+            throw $e;
         }
     }
 }

app/Jobs/SendMessageToDiscordJob.php

@@ -3,13 +3,14 @@
 namespace App\Jobs;
 
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Http;
 
-class SendMessageToDiscordJob implements ShouldQueue
+class SendMessageToDiscordJob implements ShouldQueue, ShouldBeEncrypted
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 

app/Jobs/SendMessageToTelegramJob.php

@@ -3,14 +3,15 @@
 namespace App\Jobs;
 
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Http;
-use Str;
+use Illuminate\Support\Str;
 
-class SendMessageToTelegramJob implements ShouldQueue
+class SendMessageToTelegramJob implements ShouldQueue, ShouldBeEncrypted
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 

app/Jobs/SubscriptionInvoiceFailedJob.php

@@ -4,13 +4,14 @@ namespace App\Jobs;
 
 use App\Models\Team;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
-class SubscriptionInvoiceFailedJob implements ShouldQueue
+class SubscriptionInvoiceFailedJob implements ShouldQueue, ShouldBeEncrypted
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
@@ -33,10 +34,10 @@ class SubscriptionInvoiceFailedJob implements ShouldQueue
                     send_user_an_email($mail, $member->email);
                 }
             });
-        } catch (\Throwable $th) {
-            send_internal_notification('SubscriptionInvoiceFailedJob failed with: ' . $th->getMessage());
-            ray($th->getMessage());
-            throw $th;
+        } catch (\Throwable $e) {
+            send_internal_notification('SubscriptionInvoiceFailedJob failed with: ' . $e->getMessage());
+            ray($e->getMessage());
+            throw $e;
         }
     }
 }

app/Jobs/SubscriptionTrialEndedJob.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\Team;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class SubscriptionTrialEndedJob implements ShouldQueue, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public function __construct(
+        public Team $team
+    ) {
+    }
+
+    public function handle(): void
+    {
+        try {
+            $session = getStripeCustomerPortalSession($this->team);
+            $mail = new MailMessage();
+            $mail->subject('Action required: You trial in Coolify Cloud ended.');
+            $mail->view('emails.trial-ended', [
+                'stripeCustomerPortal' => $session->url,
+            ]);
+            $this->team->members()->each(function ($member) use ($mail) {
+                if ($member->isAdmin()) {
+                    ray('Sending trial ended email to ' . $member->email);
+                    send_user_an_email($mail, $member->email);
+                    send_internal_notification('Trial reminder email sent to ' . $member->email);
+                }
+            });
+        } catch (\Throwable $e) {
+            send_internal_notification('SubscriptionTrialEndsSoonJob failed with: ' . $e->getMessage());
+            ray($e->getMessage());
+            throw $e;
+        }
+    }
+}

app/Jobs/SubscriptionTrialEndsSoonJob.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\Team;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class SubscriptionTrialEndsSoonJob implements ShouldQueue, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public function __construct(
+        public Team $team
+    ) {
+    }
+
+    public function handle(): void
+    {
+        try {
+            $session = getStripeCustomerPortalSession($this->team);
+            $mail = new MailMessage();
+            $mail->subject('You trial in Coolify Cloud ends soon.');
+            $mail->view('emails.trial-ends-soon', [
+                'stripeCustomerPortal' => $session->url,
+            ]);
+            $this->team->members()->each(function ($member) use ($mail) {
+                if ($member->isAdmin()) {
+                    ray('Sending trial ending email to ' . $member->email);
+                    send_user_an_email($mail, $member->email);
+                    send_internal_notification('Trial reminder email sent to ' . $member->email);
+                }
+            });
+        } catch (\Throwable $e) {
+            send_internal_notification('SubscriptionTrialEndsSoonJob failed with: ' . $e->getMessage());
+            ray($e->getMessage());
+            throw $e;
+        }
+    }
+}

app/Models/EnvironmentVariable.php

@@ -20,7 +20,7 @@ class EnvironmentVariable extends Model
     {
         static::created(function ($environment_variable) {
             if ($environment_variable->application_id && !$environment_variable->is_preview) {
-                $found = ModelsEnvironmentVariable::where('key', $environment_variable->key)->where('application_id', $environment_variable->application_id)->where('is_preview',true)->first();
+                $found = ModelsEnvironmentVariable::where('key', $environment_variable->key)->where('application_id', $environment_variable->application_id)->where('is_preview', true)->first();
                 if (!$found) {
                     ModelsEnvironmentVariable::create([
                         'key' => $environment_variable->key,
@@ -45,26 +45,22 @@ class EnvironmentVariable extends Model
     private function get_environment_variables(string $environment_variable): string|null
     {
         // $team_id = currentTeam()->id;
-        if (str_contains(trim($environment_variable), '{{') && str_contains(trim($environment_variable), '}}')) {
-            $environment_variable = preg_replace('/\s+/', '', $environment_variable);
-            $environment_variable = str_replace('{{', '', $environment_variable);
-            $environment_variable = str_replace('}}', '', $environment_variable);
-            if (str_starts_with($environment_variable, 'global.')) {
-                $environment_variable = str_replace('global.', '', $environment_variable);
-                // $environment_variable = GlobalEnvironmentVariable::where('name', $environment_variable)->where('team_id', $team_id)->first()?->value;
-                return $environment_variable;
-            }
+        $environment_variable = trim(decrypt($environment_variable));
+        if (Str::startsWith($environment_variable, '{{') && Str::endsWith($environment_variable, '}}') && Str::contains($environment_variable, 'global.')) {
+            $variable = Str::after($environment_variable, 'global.');
+            $variable = Str::before($variable, '}}');
+            $variable = Str::of($variable)->trim()->value;
+               // $environment_variable = GlobalEnvironmentVariable::where('name', $environment_variable)->where('team_id', $team_id)->first()?->value;
+               ray('global env variable');
+               return $environment_variable;
         }
-        return decrypt($environment_variable);
+        return $environment_variable;
     }
 
     private function set_environment_variables(string $environment_variable): string|null
     {
         $environment_variable = trim($environment_variable);
-        if (!str_contains(trim($environment_variable), '{{') && !str_contains(trim($environment_variable), '}}')) {
-            return encrypt($environment_variable);
-        }
-        return $environment_variable;
+        return encrypt($environment_variable);
     }
 
     protected function key(): Attribute

app/Models/PrivateKey.php

@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use phpseclib3\Crypt\PublicKeyLoader;
 
 class PrivateKey extends BaseModel
 {
@@ -19,6 +20,15 @@ class PrivateKey extends BaseModel
         return PrivateKey::whereTeamId(currentTeam()->id)->select($selectArray->all());
     }
 
+    public function publicKey()
+    {
+        try {
+            return PublicKeyLoader::load($this->private_key)->getPublicKey()->toString('OpenSSH',['comment' => '']);
+        } catch (\Throwable $e) {
+            return 'Error loading private key';
+        }
+    }
+
     public function isEmpty()
     {
         if ($this->servers()->count() === 0 && $this->applications()->count() === 0 && $this->githubApps()->count() === 0 && $this->gitlabApps()->count() === 0) {