Merge pull request #3663 from coollabsio/next

v4.0.0-beta.350
2024-10-03 10:09:05 +02:00
parent 5354561c39 a6a3abc273
commit 436a1d945f
33 changed files with 320 additions and 171 deletions
--- a/app/Console/Commands/CheckApplicationDeploymentQueue.php
+++ b/app/Console/Commands/CheckApplicationDeploymentQueue.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Enums\ApplicationDeploymentStatus;
+use App\Models\ApplicationDeploymentQueue;
+use Illuminate\Console\Command;
+
+class CheckApplicationDeploymentQueue extends Command
+{
+    protected $signature = 'check:deployment-queue {--force} {--seconds=3600}';
+
+    protected $description = 'Check application deployment queue.';
+
+    public function handle()
+    {
+        $seconds = $this->option('seconds');
+        $deployments = ApplicationDeploymentQueue::whereIn('status', [
+            ApplicationDeploymentStatus::IN_PROGRESS,
+            ApplicationDeploymentStatus::QUEUED,
+        ])->where('created_at', '>=', now()->subSeconds($seconds))->get();
+        if ($deployments->isEmpty()) {
+            $this->info('No deployments found in the last '.$seconds.' seconds.');
+
+            return;
+        }
+
+        $this->info('Found '.$deployments->count().' deployments created in the last '.$seconds.' seconds.');
+
+        foreach ($deployments as $deployment) {
+            if ($this->option('force')) {
+                $this->info('Deployment '.$deployment->id.' created at '.$deployment->created_at.' is older than '.$seconds.' seconds. Setting status to failed.');
+                $this->cancelDeployment($deployment);
+            } else {
+                $this->info('Deployment '.$deployment->id.' created at '.$deployment->created_at.' is older than '.$seconds.' seconds. Setting status to failed.');
+                if ($this->confirm('Do you want to cancel this deployment?', true)) {
+                    $this->cancelDeployment($deployment);
+                }
+            }
+        }
+    }
+
+    private function cancelDeployment(ApplicationDeploymentQueue $deployment)
+    {
+        $deployment->update(['status' => ApplicationDeploymentStatus::FAILED]);
+        if ($deployment->server?->isFunctional()) {
+            remote_process(['docker rm -f '.$deployment->deployment_uuid], $deployment->server, false);
+        }
+    }
+}
--- a/app/Console/Commands/CleanupApplicationDeploymentQueue.php
+++ b/app/Console/Commands/CleanupApplicationDeploymentQueue.php
@@ -7,9 +7,9 @@ use Illuminate\Console\Command;

 class CleanupApplicationDeploymentQueue extends Command
 {
-    protected $signature = 'cleanup:application-deployment-queue {--team-id=}';
+    protected $signature = 'cleanup:deployment-queue {--team-id=}';

-    protected $description = 'CleanupApplicationDeploymentQueue';
+    protected $description = 'Cleanup application deployment queue.';

    public function handle()
    {
--- a/app/Console/Commands/CleanupStuckedResources.php
+++ b/app/Console/Commands/CleanupStuckedResources.php
@@ -4,6 +4,7 @@ namespace App\Console\Commands;

 use App\Jobs\CleanupHelperContainersJob;
 use App\Models\Application;
+use App\Models\ApplicationDeploymentQueue;
 use App\Models\ApplicationPreview;
 use App\Models\ScheduledDatabaseBackup;
 use App\Models\ScheduledTask;
@@ -47,6 +48,17 @@ class CleanupStuckedResources extends Command
        } catch (\Throwable $e) {
            echo "Error in cleaning stucked resources: {$e->getMessage()}\n";
        }
+        try {
+            $applicationsDeploymentQueue = ApplicationDeploymentQueue::get();
+            foreach ($applicationsDeploymentQueue as $applicationDeploymentQueue) {
+                if (is_null($applicationDeploymentQueue->application)) {
+                    echo "Deleting stuck application deployment queue: {$applicationDeploymentQueue->id}\n";
+                    $applicationDeploymentQueue->delete();
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in cleaning stuck application deployment queue: {$e->getMessage()}\n";
+        }
        try {
            $applications = Application::withTrashed()->whereNotNull('deleted_at')->get();
            foreach ($applications as $application) {
--- a/app/Helpers/SshMultiplexingHelper.php
+++ b/app/Helpers/SshMultiplexingHelper.php
@@ -94,7 +94,9 @@ class SshMultiplexingHelper
        $muxPersistTime = config('constants.ssh.mux_persist_time');

        $scp_command = "timeout $timeout scp ";
-
+        if ($server->isIpv6()) {
+            $scp_command .= '-6 ';
+        }
        if (self::isMultiplexingEnabled()) {
            $scp_command .= "-o ControlMaster=auto -o ControlPath=$muxSocket -o ControlPersist={$muxPersistTime} ";
            self::ensureMultiplexedConnection($server);
@@ -136,8 +138,8 @@ class SshMultiplexingHelper

        $ssh_command .= self::getCommonSshOptions($server, $sshKeyLocation, config('constants.ssh.connection_timeout'), config('constants.ssh.server_interval'));

-        $command = "PATH=\$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/host/usr/local/sbin:/host/usr/local/bin:/host/usr/sbin:/host/usr/bin:/host/sbin:/host/bin && $command";
        $delimiter = Hash::make($command);
+        $delimiter = base64_encode($delimiter);
        $command = str_replace($delimiter, '', $command);

        $ssh_command .= "{$server->user}@{$server->ip} 'bash -se' << \\$delimiter".PHP_EOL
--- a/app/Jobs/DatabaseBackupJob.php
+++ b/app/Jobs/DatabaseBackupJob.php
@@ -2,7 +2,6 @@

 namespace App\Jobs;

-use App\Actions\Database\StopDatabase;
 use App\Events\BackupCreated;
 use App\Models\S3Storage;
 use App\Models\ScheduledDatabaseBackup;
@@ -24,7 +23,6 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Str;
-use Visus\Cuid2\Cuid2;

 class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
 {
@@ -63,30 +61,26 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
    public function __construct($backup)
    {
        $this->backup = $backup;
-        $this->team = Team::find($backup->team_id);
-        if (is_null($this->team)) {
-            return;
-        }
-        if (data_get($this->backup, 'database_type') === 'App\Models\ServiceDatabase') {
-            $this->database = data_get($this->backup, 'database');
-            $this->server = $this->database->service->server;
-            $this->s3 = $this->backup->s3;
-        } else {
-            $this->database = data_get($this->backup, 'database');
-            $this->server = $this->database->destination->server;
-            $this->s3 = $this->backup->s3;
-        }
    }

    public function handle(): void
    {
        try {
-            // Check if team is exists
-            if (is_null($this->team)) {
-                StopDatabase::run($this->database);
-                $this->database->delete();
-
-                return;
+            $this->team = Team::findOrFail($this->backup->team_id);
+            if (data_get($this->backup, 'database_type') === 'App\Models\ServiceDatabase') {
+                $this->database = data_get($this->backup, 'database');
+                $this->server = $this->database->service->server;
+                $this->s3 = $this->backup->s3;
+            } else {
+                $this->database = data_get($this->backup, 'database');
+                $this->server = $this->database->destination->server;
+                $this->s3 = $this->backup->s3;
+            }
+            if (is_null($this->server)) {
+                throw new \Exception('Server not found?!');
+            }
+            if (is_null($this->database)) {
+                throw new \Exception('Database not found?!');
            }

            BackupCreated::dispatch($this->team->id);
@@ -237,7 +231,6 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
                }
            }
            $this->backup_dir = backup_dir().'/databases/'.str($this->team->name)->slug().'-'.$this->team->id.'/'.$this->directory_name;
-
            if ($this->database->name === 'coolify-db') {
                $databasesToBackup = ['coolify'];
                $this->directory_name = $this->container_name = 'coolify-db';
@@ -325,7 +318,9 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
            send_internal_notification('DatabaseBackupJob failed with: '.$e->getMessage());
            throw $e;
        } finally {
-            BackupCreated::dispatch($this->team->id);
+            if ($this->team) {
+                BackupCreated::dispatch($this->team->id);
+            }
        }
    }

@@ -466,34 +461,6 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
        }
    }

-    // private function upload_to_s3(): void
-    // {
-    //     try {
-    //         if (is_null($this->s3)) {
-    //             return;
-    //         }
-    //         $key = $this->s3->key;
-    //         $secret = $this->s3->secret;
-    //         // $region = $this->s3->region;
-    //         $bucket = $this->s3->bucket;
-    //         $endpoint = $this->s3->endpoint;
-    //         $this->s3->testConnection(shouldSave: true);
-    //         $configName = new Cuid2;
-
-    //         $s3_copy_dir = str($this->backup_location)->replace(backup_dir(), '/var/www/html/storage/app/backups/');
-    //         $commands[] = "docker exec coolify bash -c 'mc config host add {$configName} {$endpoint} $key $secret'";
-    //         $commands[] = "docker exec coolify bash -c 'mc cp $s3_copy_dir {$configName}/{$bucket}{$this->backup_dir}/'";
-    //         instant_remote_process($commands, $this->server);
-    //         $this->add_to_backup_output('Uploaded to S3.');
-    //     } catch (\Throwable $e) {
-    //         $this->add_to_backup_output($e->getMessage());
-    //         throw $e;
-    //     } finally {
-    //         $removeConfigCommands[] = "docker exec coolify bash -c 'mc config remove {$configName}'";
-    //         $removeConfigCommands[] = "docker exec coolify bash -c 'mc alias rm {$configName}'";
-    //         instant_remote_process($removeConfigCommands, $this->server, false);
-    //     }
-    // }
    private function upload_to_s3(): void
    {
        try {
@@ -515,10 +482,27 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
            $this->ensureHelperImageAvailable();

            $fullImageName = $this->getFullImageName();
-            $commands[] = "docker run -d --network {$network} --name backup-of-{$this->backup->uuid} --rm -v $this->backup_location:$this->backup_location:ro {$fullImageName}";
-            $commands[] = "docker exec backup-of-{$this->backup->uuid} mc config host add temporary {$endpoint} $key $secret";
+
+            if (isDev()) {
+                if ($this->database->name === 'coolify-db') {
+                    $backup_location_from = '/var/lib/docker/volumes/coolify_dev_backups_data/_data/coolify/coolify-db-'.$this->server->ip.$this->backup_file;
+                    $commands[] = "docker run -d --network {$network} --name backup-of-{$this->backup->uuid} --rm -v $backup_location_from:$this->backup_location:ro {$fullImageName}";
+                } else {
+                    $backup_location_from = '/var/lib/docker/volumes/coolify_dev_backups_data/_data/databases/'.str($this->team->name)->slug().'-'.$this->team->id.'/'.$this->directory_name.$this->backup_file;
+                    $commands[] = "docker run -d --network {$network} --name backup-of-{$this->backup->uuid} --rm -v $backup_location_from:$this->backup_location:ro {$fullImageName}";
+                }
+            } else {
+                $commands[] = "docker run -d --network {$network} --name backup-of-{$this->backup->uuid} --rm -v $this->backup_location:$this->backup_location:ro {$fullImageName}";
+            }
+            if ($this->s3->isHetzner()) {
+                $endpointWithoutBucket = 'https://'.str($endpoint)->after('https://')->after('.')->value();
+                $commands[] = "docker exec backup-of-{$this->backup->uuid} mc alias set --path=off --api=S3v4 temporary {$endpointWithoutBucket} $key $secret";
+            } else {
+                $commands[] = "docker exec backup-of-{$this->backup->uuid} mc config host add temporary {$endpoint} $key $secret";
+            }
            $commands[] = "docker exec backup-of-{$this->backup->uuid} mc cp $this->backup_location temporary/$bucket{$this->backup_dir}/";
            instant_remote_process($commands, $this->server);
+
            $this->add_to_backup_output('Uploaded to S3.');
        } catch (\Throwable $e) {
            $this->add_to_backup_output($e->getMessage());
--- a/app/Livewire/Dashboard.php
+++ b/app/Livewire/Dashboard.php
@@ -30,7 +30,7 @@ class Dashboard extends Component

    public function cleanup_queue()
    {
-        Artisan::queue('cleanup:application-deployment-queue', [
+        Artisan::queue('cleanup:deployment-queue', [
            '--team-id' => currentTeam()->id,
        ]);
    }
--- a/app/Livewire/Project/Shared/Terminal.php
+++ b/app/Livewire/Project/Shared/Terminal.php
@@ -34,9 +34,9 @@ class Terminal extends Component
            if ($status !== 'running') {
                return;
            }
-            $command = SshMultiplexingHelper::generateSshCommand($server, "docker exec -it {$identifier} sh -c 'if [ -f ~/.profile ]; then . ~/.profile; fi; if [ -n \"\$SHELL\" ]; then exec \$SHELL; else sh; fi'");
+            $command = SshMultiplexingHelper::generateSshCommand($server, "docker exec -it {$identifier} sh -c 'PATH=\$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin && if [ -f ~/.profile ]; then . ~/.profile; fi && if [ -n \"\$SHELL\" ]; then exec \$SHELL; else sh; fi'");
        } else {
-            $command = SshMultiplexingHelper::generateSshCommand($server, "sh -c 'if [ -f ~/.profile ]; then . ~/.profile; fi; if [ -n \"\$SHELL\" ]; then exec \$SHELL; else sh; fi'");
+            $command = SshMultiplexingHelper::generateSshCommand($server, 'PATH=$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin && if [ -f ~/.profile ]; then . ~/.profile; fi && if [ -n "$SHELL" ]; then exec $SHELL; else sh; fi');
        }

        // ssh command is sent back to frontend then to websocket
--- a/app/Livewire/Security/ApiTokens.php
+++ b/app/Livewire/Security/ApiTokens.php
@@ -15,6 +15,8 @@ class ApiTokens extends Component

    public bool $readOnly = true;

+    public bool $rootAccess = false;
+
    public array $permissions = ['read-only'];

    public $isApiEnabled;
@@ -35,12 +37,11 @@ class ApiTokens extends Component
        if ($this->viewSensitiveData) {
            $this->permissions[] = 'view:sensitive';
            $this->permissions = array_diff($this->permissions, ['*']);
+            $this->rootAccess = false;
        } else {
            $this->permissions = array_diff($this->permissions, ['view:sensitive']);
        }
-        if (count($this->permissions) == 0) {
-            $this->permissions = ['*'];
-        }
+        $this->makeSureOneIsSelected();
    }

    public function updatedReadOnly()
@@ -48,11 +49,30 @@ class ApiTokens extends Component
        if ($this->readOnly) {
            $this->permissions[] = 'read-only';
            $this->permissions = array_diff($this->permissions, ['*']);
+            $this->rootAccess = false;
        } else {
            $this->permissions = array_diff($this->permissions, ['read-only']);
        }
-        if (count($this->permissions) == 0) {
+        $this->makeSureOneIsSelected();
+    }
+
+    public function updatedRootAccess()
+    {
+        if ($this->rootAccess) {
            $this->permissions = ['*'];
+            $this->readOnly = false;
+            $this->viewSensitiveData = false;
+        } else {
+            $this->readOnly = true;
+            $this->permissions = ['read-only'];
+        }
+    }
+
+    public function makeSureOneIsSelected()
+    {
+        if (count($this->permissions) == 0) {
+            $this->permissions = ['read-only'];
+            $this->readOnly = true;
        }
    }

@@ -62,12 +82,6 @@ class ApiTokens extends Component
            $this->validate([
                'description' => 'required|min:3|max:255',
            ]);
-            // if ($this->viewSensitiveData) {
-            //     $this->permissions[] = 'view:sensitive';
-            // }
-            // if ($this->readOnly) {
-            //     $this->permissions[] = 'read-only';
-            // }
            $token = auth()->user()->createToken($this->description, $this->permissions);
            $this->tokens = auth()->user()->tokens;
            session()->flash('token', $token->plainTextToken);
--- a/app/Livewire/Server/ConfigureCloudflareTunnels.php
+++ b/app/Livewire/Server/ConfigureCloudflareTunnels.php
@@ -30,6 +30,11 @@ class ConfigureCloudflareTunnels extends Component
    public function submit()
    {
        try {
+            if (str($this->ssh_domain)->contains('https://')) {
+                $this->ssh_domain = str($this->ssh_domain)->replace('https://', '')->replace('http://', '')->trim();
+                // remove / from the end
+                $this->ssh_domain = str($this->ssh_domain)->replace('/', '');
+            }
            $server = Server::ownedByCurrentTeam()->where('id', $this->server_id)->firstOrFail();
            ConfigureCloudflared::dispatch($server, $this->cloudflare_token);
            $server->settings->is_cloudflare_tunnel = true;
--- a/app/Livewire/Storage/Create.php
+++ b/app/Livewire/Storage/Create.php
@@ -43,15 +43,17 @@ class Create extends Component
        'endpoint' => 'Endpoint',
    ];

-    public function mount()
+    public function updatedEndpoint($value)
    {
-        if (isDev()) {
-            $this->name = 'Local MinIO';
-            $this->description = 'Local MinIO';
-            $this->key = 'minioadmin';
-            $this->secret = 'minioadmin';
-            $this->bucket = 'local';
-            $this->endpoint = 'http://coolify-minio:9000';
+        if (! str($value)->startsWith('https://') && ! str($value)->startsWith('http://')) {
+            $this->endpoint = 'https://'.$value;
+            $value = $this->endpoint;
+        }
+
+        if (str($value)->contains('your-objectstorage.com') && ! isset($this->bucket)) {
+            $this->bucket = str($value)->after('//')->before('.');
+        } elseif (str($value)->contains('your-objectstorage.com')) {
+            $this->bucket = $this->bucket ?: str($value)->after('//')->before('.');
        }
    }

--- a/app/Models/Application.php
+++ b/app/Models/Application.php
@@ -143,6 +143,9 @@ class Application extends BaseModel
            }
            $application->tags()->detach();
            $application->previews()->delete();
+            foreach ($application->deployment_queue as $deployment) {
+                $deployment->delete();
+            }
        });
    }

@@ -710,6 +713,11 @@ class Application extends BaseModel
        return $this->hasMany(ApplicationPreview::class);
    }

+    public function deployment_queue()
+    {
+        return $this->hasMany(ApplicationDeploymentQueue::class);
+    }
+
    public function destination()
    {
        return $this->morphTo();
--- a/app/Models/ApplicationDeploymentQueue.php
+++ b/app/Models/ApplicationDeploymentQueue.php
@@ -2,6 +2,7 @@

 namespace App\Models;

+use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Carbon;
 use OpenApi\Attributes as OA;
@@ -39,6 +40,20 @@ class ApplicationDeploymentQueue extends Model
 {
    protected $guarded = [];

+    public function application(): Attribute
+    {
+        return Attribute::make(
+            get: fn () => Application::find($this->application_id),
+        );
+    }
+
+    public function server(): Attribute
+    {
+        return Attribute::make(
+            get: fn () => Server::find($this->server_id),
+        );
+    }
+
    public function setStatus(string $status)
    {
        $this->update([
--- a/app/Models/S3Storage.php
+++ b/app/Models/S3Storage.php
@@ -40,6 +40,16 @@ class S3Storage extends BaseModel
        return "{$this->endpoint}/{$this->bucket}";
    }

+    public function isHetzner()
+    {
+        return str($this->endpoint)->contains('your-objectstorage.com');
+    }
+
+    public function isDigitalOcean()
+    {
+        return str($this->endpoint)->contains('digitaloceanspaces.com');
+    }
+
    public function testConnection(bool $shouldSave = false)
    {
        try {
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -1221,4 +1221,9 @@ $schema://$host {

        return instant_remote_process($commands, $this, false);
    }
+
+    public function isIpv6(): bool
+    {
+        return str($this->ip)->contains(':');
+    }
 }
--- a/bootstrap/helpers/s3.php
+++ b/bootstrap/helpers/s3.php
@@ -1,14 +1,11 @@
 <?php

 use App\Models\S3Storage;
-use Illuminate\Support\Str;

 function set_s3_target(S3Storage $s3)
 {
    $is_digital_ocean = false;
-    if ($s3->endpoint) {
-        $is_digital_ocean = Str::contains($s3->endpoint, 'digitaloceanspaces.com');
-    }
+
    config()->set('filesystems.disks.custom-s3', [
        'driver' => 's3',
        'region' => $s3['region'],
@@ -17,7 +14,7 @@ function set_s3_target(S3Storage $s3)
        'bucket' => $s3['bucket'],
        'endpoint' => $s3['endpoint'],
        'use_path_style_endpoint' => true,
-        'bucket_endpoint' => $is_digital_ocean,
+        'bucket_endpoint' => $s3->isHetzner() || $s3->isDigitalOcean(),
        'aws_url' => $s3->awsUrl(),
    ]);
 }
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -1184,14 +1184,16 @@ function check_domain_usage(ServiceApplication|Application|null $resource = null
 function parseCommandsByLineForSudo(Collection $commands, Server $server): array
 {
    $commands = $commands->map(function ($line) {
-        if (! str(trim($line))->startsWith([
-            'cd',
-            'command',
-            'echo',
-            'true',
-            'if',
-            'fi',
-        ])) {
+        if (
+            ! str(trim($line))->startsWith([
+                'cd',
+                'command',
+                'echo',
+                'true',
+                'if',
+                'fi',
+            ])
+        ) {
            return "sudo $line";
        }

@@ -3863,14 +3865,19 @@ function convertComposeEnvironmentToArray($environment)
 {
    $convertedServiceVariables = collect([]);
    if (isAssociativeArray($environment)) {
+        // Example: $environment = ['FOO' => 'bar', 'BAZ' => 'qux'];
        if ($environment instanceof Collection) {
            $changedEnvironment = collect([]);
            $environment->each(function ($value, $key) use ($changedEnvironment) {
-                $parts = explode('=', $value, 2);
-                if (count($parts) === 2) {
-                    $key = $parts[0];
-                    $realValue = $parts[1] ?? '';
-                    $changedEnvironment->put($key, $realValue);
+                if (is_numeric($key)) {
+                    $parts = explode('=', $value, 2);
+                    if (count($parts) === 2) {
+                        $key = $parts[0];
+                        $realValue = $parts[1] ?? '';
+                        $changedEnvironment->put($key, $realValue);
+                    } else {
+                        $changedEnvironment->put($key, $value);
+                    }
                } else {
                    $changedEnvironment->put($key, $value);
                }
@@ -3880,6 +3887,7 @@ function convertComposeEnvironmentToArray($environment)
        }
        $convertedServiceVariables = $environment;
    } else {
+        // Example: $environment = ['FOO=bar', 'BAZ=qux'];
        foreach ($environment as $value) {
            $parts = explode('=', $value, 2);
            $key = $parts[0];
--- a/config/sentry.php
+++ b/config/sentry.php
@@ -7,7 +7,7 @@ return [

    // The release version of your application
    // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.349',
+    'release' => '4.0.0-beta.350',
    // When left empty or `null` the Laravel environment will be used
    'environment' => config('app.env'),

--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php

-return '4.0.0-beta.349';
+return '4.0.0-beta.350';
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -58,6 +58,7 @@ services:
      SOKETI_DEFAULT_APP_ID: "${PUSHER_APP_ID:-coolify}"
      SOKETI_DEFAULT_APP_KEY: "${PUSHER_APP_KEY:-coolify}"
      SOKETI_DEFAULT_APP_SECRET: "${PUSHER_APP_SECRET:-coolify}"
+    entrypoint: ["/bin/sh", "/soketi-entrypoint.sh"]
  vite:
    image: node:20
    pull_policy: always
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -113,7 +113,7 @@ services:
      retries: 10
      timeout: 2s
  soketi:
-    image: 'ghcr.io/coollabsio/coolify-realtime:1.0.2'
+    image: 'ghcr.io/coollabsio/coolify-realtime:1.0.3'
    ports:
      - "${SOKETI_PORT:-6001}:6001"
      - "6002:6002"
--- a/docker/coolify-realtime/Dockerfile
+++ b/docker/coolify-realtime/Dockerfile
@@ -1,9 +1,27 @@
 FROM quay.io/soketi/soketi:1.6-16-alpine
+
+ARG TARGETPLATFORM
+# https://github.com/cloudflare/cloudflared/releases
+ARG CLOUDFLARED_VERSION=2024.4.1
+
 WORKDIR /terminal
-RUN apk add --no-cache openssh-client make g++ python3
+RUN apk add --no-cache openssh-client make g++ python3 curl
 COPY docker/coolify-realtime/package.json ./
 RUN npm i
 RUN npm rebuild node-pty --update-binary
 COPY docker/coolify-realtime/soketi-entrypoint.sh /soketi-entrypoint.sh
 COPY docker/coolify-realtime/terminal-server.js /terminal/terminal-server.js
+
+RUN /bin/sh -c "if [[ ${TARGETPLATFORM} == 'linux/amd64' ]]; then \
+    echo 'amd64' && \
+    curl -sSL https://github.com/cloudflare/cloudflared/releases/download/${CLOUDFLARED_VERSION}/cloudflared-linux-amd64 -o /usr/local/bin/cloudflared && chmod +x /usr/local/bin/cloudflared \
+    ;fi"
+
+RUN /bin/sh -c "if [[ ${TARGETPLATFORM} == 'linux/arm64' ]]; then \
+    echo 'arm64' && \
+    curl -L https://github.com/cloudflare/cloudflared/releases/download/${CLOUDFLARED_VERSION}/cloudflared-linux-arm64 -o /usr/local/bin/cloudflared && chmod +x /usr/local/bin/cloudflared \
+    ;fi"
+
+
+
 ENTRYPOINT ["/bin/sh", "/soketi-entrypoint.sh"]
--- a/docker/coolify-realtime/soketi-entrypoint.sh
+++ b/docker/coolify-realtime/soketi-entrypoint.sh
@@ -1,11 +1,19 @@
 #!/bin/sh
 # Function to timestamp logs
+
+# Check if the first argument is 'watch'
+if [ "$1" = "watch" ]; then
+    WATCH_MODE="--watch"
+else
+    WATCH_MODE=""
+fi
+
 timestamp() {
    date "+%Y-%m-%d %H:%M:%S"
 }

 # Start the terminal server in the background with logging
-node /terminal/terminal-server.js > >(while read line; do echo "$(timestamp) [TERMINAL] $line"; done) 2>&1 &
+node $WATCH_MODE /terminal/terminal-server.js > >(while read line; do echo "$(timestamp) [TERMINAL] $line"; done) 2>&1 &
 TERMINAL_PID=$!

 # Start the Soketi process in the background with logging
--- a/docker/coolify-realtime/terminal-server.js
+++ b/docker/coolify-realtime/terminal-server.js
@@ -61,9 +61,13 @@ wss.on('connection', (ws) => {
    const userSession = { ws, userId, ptyProcess: null, isActive: false };
    userSessions.set(userId, userSession);

-    ws.on('message', (message) => handleMessage(userSession, message));
+    ws.on('message', (message) => {
+        handleMessage(userSession, message);
+
+    });
    ws.on('error', (err) => handleError(err, userId));
    ws.on('close', () => handleClose(userId));
+
 });

 const messageHandlers = {
@@ -108,7 +112,6 @@ function parseMessage(message) {

 async function handleCommand(ws, command, userId) {
    const userSession = userSessions.get(userId);
-
    if (userSession && userSession.isActive) {
        const result = await killPtyProcess(userId);
        if (!result) {
@@ -127,6 +130,7 @@ async function handleCommand(ws, command, userId) {
        cols: 80,
        rows: 30,
        cwd: process.env.HOME,
+        env: {},
    };

    // NOTE: - Initiates a process within the Terminal container
@@ -139,13 +143,16 @@ async function handleCommand(ws, command, userId) {

    ws.send('pty-ready');

-    ptyProcess.onData((data) => ws.send(data));
+    ptyProcess.onData((data) => {
+        ws.send(data);
+    });

    // when parent closes
    ptyProcess.onExit(({ exitCode, signal }) => {
        console.error(`Process exited with code ${exitCode} and signal ${signal}`);
        ws.send('pty-exited');
        userSession.isActive = false;
+
    });

    if (timeout) {
@@ -179,7 +186,7 @@ async function killPtyProcess(userId) {

            // session.ptyProcess.kill() wont work here because of https://github.com/moby/moby/issues/9098
            // patch with https://github.com/moby/moby/issues/9098#issuecomment-189743947
-            session.ptyProcess.write('kill -TERM -$$ && exit\n');
+            session.ptyProcess.write('set +o history\nkill -TERM -$$ && exit\nset -o history\n');

            setTimeout(() => {
                if (!session.isActive || !session.ptyProcess) {
@@ -228,5 +235,5 @@ function extractHereDocContent(commandString) {
 }

 server.listen(6002, () => {
-    console.log('Server listening on port 6002');
+    console.log('Coolify realtime terminal server listening on port 6002. Let the hacking begin!');
 });
--- a/resources/js/terminal.js
+++ b/resources/js/terminal.js
@@ -16,6 +16,7 @@ export function initializeTerminalComponent() {
            paused: false,
            MAX_PENDING_WRITES: 5,
            keepAliveInterval: null,
+            reconnectInterval: null,

            init() {
                this.setupTerminal();
@@ -48,6 +49,9 @@ export function initializeTerminalComponent() {
                    document.addEventListener(event, () => {
                        this.checkIfProcessIsRunningAndKillIt();
                        clearInterval(this.keepAliveInterval);
+                        if (this.reconnectInterval) {
+                            clearInterval(this.reconnectInterval);
+                        }
                    }, { once: true });
                });

@@ -103,11 +107,27 @@ export function initializeTerminalComponent() {
                    };
                    this.socket.onclose = () => {
                        console.log('WebSocket connection closed');
-
+                        this.reconnect();
                    };
                }
            },

+            reconnect() {
+                if (this.reconnectInterval) {
+                    clearInterval(this.reconnectInterval);
+                }
+                this.reconnectInterval = setInterval(() => {
+                    console.log('Attempting to reconnect...');
+                    this.initializeWebSocket();
+                    if (this.socket && this.socket.readyState === WebSocket.OPEN) {
+                        console.log('Reconnected successfully');
+                        clearInterval(this.reconnectInterval);
+                        this.reconnectInterval = null;
+                        window.location.reload();
+                    }
+                }, 2000);
+            },
+
            handleSocketMessage(event) {
                this.message = '(connection closed)';
                if (event.data === 'pty-ready') {
--- a/resources/views/components/modal-confirmation.blade.php
+++ b/resources/views/components/modal-confirmation.blade.php
@@ -151,9 +151,9 @@
        @endif
    @endif
    <template x-teleport="body">
-        <div x-show="modalOpen"
+        <div x-show="modalOpen" @click.away="modalOpen = false; resetModal()"
            class="fixed top-0 lg:pt-10 left-0 z-[99] flex items-start justify-center w-screen h-screen" x-cloak>
-            <div x-show="modalOpen"
+            <div x-show="modalOpen" @click="modalOpen = false; resetModal()"
                class="absolute inset-0 w-full h-full bg-black bg-opacity-20 backdrop-blur-sm"></div>
            <div x-show="modalOpen" x-trap.inert.noscroll="modalOpen" x-transition:enter="ease-out duration-100"
                x-transition:enter-start="opacity-0 -translate-y-2 sm:scale-95"
@@ -222,12 +222,12 @@
                                </template>
                            @endforeach
                        </ul>
-                        @if ($confirmWithText && $confirmationText)
+                        @if ($confirmWithText)
                            <div class="mb-4">
                                <h4 class="mb-2 text-lg font-semibold">Confirm Actions</h4>
                                <p class="mb-2 text-sm">{{ $confirmationLabel }}</p>
                                <div class="relative mb-2">
-                                    <input autocomplete="off" type="text" x-model="confirmationText"
+                                    <input type="text" x-model="confirmationText"
                                        class="p-2 pr-10 w-full text-black rounded cursor-text input" readonly>
                                    <button @click="copyConfirmationText()"
                                        class="absolute right-2 top-1/2 text-gray-500 transform -translate-y-1/2 hover:text-gray-700"
@@ -255,7 +255,7 @@
                                    class="block mt-4 text-sm font-medium text-gray-700 dark:text-gray-300">
                                    {{ $shortConfirmationLabel }}
                                </label>
-                                <input autocomplete="off" type="text" x-model="userConfirmationText"
+                                <input type="text" x-model="userConfirmationText"
                                    class="p-2 mt-1 w-full text-black rounded input">
                            </div>
                        @endif
@@ -272,8 +272,10 @@
                                class="block text-sm font-medium text-gray-700 dark:text-gray-300">
                                Your Password
                            </label>
-                            <input autocomplete="off" type="password" id="password-confirm" x-model="password" class="w-full input"
-                                placeholder="Enter your password">
+                            <form action="return false">
+                                <input type="password" id="password-confirm" x-model="password" class="w-full input"
+                                    placeholder="Enter your password">
+                            </form>
                            <p x-show="passwordError" x-text="passwordError" class="mt-1 text-sm text-red-500"></p>
                            @error('password')
                                <p class="mt-1 text-sm text-red-500">{{ $message }}</p>
@@ -296,20 +298,13 @@
                    </template>

                    <template x-if="step === 1">
-                        @if(isDev() && $submitAction === 'delete')
-                            <x-forms.button class="w-auto" isError
-                                    @click="$wire.delete('hello')">
-                                <span x-text="step3ButtonText"></span>
-                            </x-forms.button>
-                        @else
-                            <x-forms.button @click="step++" class="w-auto" isError>
-                                <span x-text="step1ButtonText"></span>
-                            </x-forms.button>
-                        @endif
+                        <x-forms.button @click="step++" class="w-auto" isError>
+                            <span x-text="step1ButtonText"></span>
+                        </x-forms.button>
                    </template>

                    <template x-if="step === 2">
-                        <x-forms.button x-bind:disabled="confirmationText !== '' && confirmWithText && userConfirmationText !== confirmationText"
+                        <x-forms.button x-bind:disabled="confirmWithText && userConfirmationText !== confirmationText"
                            class="w-auto" isError
                            @click="
                            if (dispatchEvent) {
--- a/resources/views/components/popup.blade.php
+++ b/resources/views/components/popup.blade.php
@@ -6,10 +6,10 @@
    x-transition:enter-start="translate-y-full" x-transition:enter-end="translate-y-0"
    x-transition:leave="transition ease-in duration-300" x-transition:leave-start="translate-y-0"
    x-transition:leave-end="translate-y-full" x-init="setTimeout(() => { bannerVisible = true }, bannerVisibleAfter);"
-    class="fixed bottom-0 right-0 w-full h-auto duration-300 ease-out sm:px-5 sm:pb-5 sm:w-[26rem] lg:w-full z-[999]"
+    class="fixed bottom-0 right-0 w-full h-auto duration-300 ease-out sm:px-5 sm:pb-5 w-full z-[999]"
    x-cloak>
    <div
-        class="flex flex-col items-center justify-between w-full h-full max-w-4xl p-6 mx-auto bg-white border shadow-lg lg:border-t dark:border-coolgray-300 dark:bg-coolgray-100 lg:p-8 lg:flex-row sm:rounded">
+        class="flex items-center flex-col justify-between w-full h-full max-w-4xl p-6 mx-auto bg-white border shadow-lg lg:border-t dark:border-coolgray-300 dark:bg-coolgray-100 lg:p-8 lg:flex-row sm:rounded">
        <div
            class="flex flex-col items-start h-full pb-6 text-xs lg:items-center lg:flex-row lg:pb-0 lg:pr-6 lg:space-x-5 dark:text-neutral-300">
            @if (isset($icon))
@@ -23,14 +23,12 @@
                <p class="">{{ $description }}</span></p>
            </div>
        </div>
-        <div class="flex items-end justify-end w-full pl-3 space-x-3 lg:flex-shrink-0 lg:w-auto">
            <button
                @if ($buttonText->attributes->whereStartsWith('@click')->first()) @click="bannerVisible=false;{{ $buttonText->attributes->get('@click') }}"
-                @else
+                    @else
                @click="bannerVisible=false;" @endif
-                class="inline-flex items-center justify-center flex-shrink-0 w-1/2 px-4 py-2 text-sm font-medium tracking-wide transition-colors duration-200 rounded-md bg-neutral-100 hover:bg-neutral-200 dark:bg-coolgray-200 lg:w-auto dark:text-neutral-200 dark:hover:bg-coolgray-300 focus:shadow-outline focus:outline-none">
+                class="w-full px-4 py-2 text-sm font-medium tracking-wide transition-colors duration-200 rounded-md bg-neutral-100 hover:bg-neutral-200 dark:bg-coolgray-200 lg:w-auto dark:text-neutral-200 dark:hover:bg-coolgray-300 focus:shadow-outline focus:outline-none">
                {{ $buttonText }}
            </button>
-        </div>
    </div>
 </div>
--- a/resources/views/livewire/layout-popups.blade.php
+++ b/resources/views/livewire/layout-popups.blade.php
@@ -32,21 +32,16 @@
            @if (!isCloud())
                <x-popup>
                    <x-slot:title>
-                        <span class="font-bold text-left text-red-500">WARNING: </span>Realtime Error?!
+                        <span class="font-bold text-left text-red-500">WARNING: </span> Cannot connect to real-time service
                    </x-slot:title>
                    <x-slot:description>
-                        <span>Coolify could not connect to its real-time service.<br>This will cause unusual problems on the
-                            UI
-                            if
-                            not fixed! <br><br>
+                        <div>This will cause unusual problems on the
+                            UI! <br><br>
                            Please ensure that you have opened the
                            <a class="underline" href='https://coolify.io/docs/knowledge-base/server/firewall'
-                                target='_blank'>required ports</a>,
-                            check the
-                            related <a class="underline" href='https://coolify.io/docs/knowledge-base/cloudflare/tunnels'
-                                target='_blank'>documentation</a> or get
+                                target='_blank'>required ports</a> or get
                            help on <a class="underline" href='https://coollabs.io/discord' target='_blank'>Discord</a>.
-                        </span>
+                        </div>
                    </x-slot:description>
                    <x-slot:button-text @click="disableRealtime()">
                        Acknowledge & Disable This Popup
--- a/resources/views/livewire/project/database/backup-executions.blade.php
+++ b/resources/views/livewire/project/database/backup-executions.blade.php
@@ -45,20 +45,11 @@
                            <x-forms.button class="dark:hover:bg-coolgray-400"
                                x-on:click="download_file('{{ data_get($execution, 'id') }}')">Download</x-forms.button>
                        @endif
-                        <x-modal-confirmation
-                        title="Confirm Backup Deletion?"
-                        buttonTitle="Delete"
-                        isErrorButton
-                        submitAction="deleteBackup({{ data_get($execution, 'id') }})"
-                        {{-- :checkboxes="$checkboxes"  --}}
-                        :actions="[
-                            'This backup will be permanently deleted from local storage.'
-                        ]"
-                        confirmationText="{{ data_get($execution, 'filename') }}"
-                        confirmationLabel="Please confirm the execution of the actions by entering the Backup Filename below"
-                        shortConfirmationLabel="Backup Filename"
-                        step3ButtonText="Permanently Delete"
-                        />
+                        <x-modal-confirmation title="Confirm Backup Deletion?" buttonTitle="Delete" isErrorButton
+                            submitAction="deleteBackup({{ data_get($execution, 'id') }})"
+                            :actions="['This backup will be permanently deleted from local storage.']" confirmationText="{{ data_get($execution, 'filename') }}"
+                            confirmationLabel="Please confirm the execution of the actions by entering the Backup Filename below"
+                            shortConfirmationLabel="Backup Filename" step3ButtonText="Permanently Delete" />
                    </div>
                </div>
            @empty
--- a/resources/views/livewire/project/database/create-scheduled-backup.blade.php
+++ b/resources/views/livewire/project/database/create-scheduled-backup.blade.php
@@ -2,16 +2,18 @@
    <x-forms.input placeholder="0 0 * * * or daily" id="frequency"
        helper="You can use every_minute, hourly, daily, weekly, monthly, yearly or a cron expression." label="Frequency"
        required />
-    <x-forms.checkbox id="save_s3" label="Save to S3" />
-    <x-forms.select id="selected_storage_id">
-        @if ($s3s->count() === 0)
-            <option value="0">No S3 Storages found.</option>
-        @else
-            @foreach ($s3s as $s3)
-                <option value="{{ $s3->id }}">{{ $s3->name }}</option>
-            @endforeach
+    @if ($s3s->count() === 0)
+        <div class="text-red-500">No validated S3 Storages found.</div>
+    @else
+        <x-forms.checkbox wire:model.live="save_s3" label="Save to S3" />
+        @if ($save_s3)
+            <x-forms.select id="selected_storage_id" label="Select a validated S3 storage">
+                @foreach ($s3s as $s3)
+                    <option value="{{ $s3->id }}">{{ $s3->name }}</option>
+                @endforeach
+            </x-forms.select>
        @endif
-    </x-forms.select>
+    @endif
    <x-forms.button type="submit" @click="modalOpen=false">
        Save
    </x-forms.button>
--- a/resources/views/livewire/security/api-tokens.blade.php
+++ b/resources/views/livewire/security/api-tokens.blade.php
@@ -6,7 +6,8 @@
    <div class="pb-4">
        <h2>API Tokens</h2>
        @if (!$isApiEnabled)
-            <div>API is disabled. If you want to use the API, please enable it in the <a href="{{ route('settings.index') }}" class="underline dark:text-white">Settings</a> menu.</div>
+            <div>API is disabled. If you want to use the API, please enable it in the <a
+                    href="{{ route('settings.index') }}" class="underline dark:text-white">Settings</a> menu.</div>
        @else
            <div>Tokens are created with the current team as scope. You will only have access to this team's resources.
            </div>
@@ -25,7 +26,7 @@
                @if ($permissions)
                    @foreach ($permissions as $permission)
                        @if ($permission === '*')
-                            <div>All (root/admin access), be careful!</div>
+                            <div>Root access, be careful!</div>
                        @else
                            <div>{{ $permission }}</div>
                        @endif
@@ -35,6 +36,7 @@
        </div>
        <h4>Token Permissions</h4>
        <div class="w-64">
+            <x-forms.checkbox label="Root Access" wire:model.live="rootAccess"></x-forms.checkbox>
            <x-forms.checkbox label="Read-only" wire:model.live="readOnly"></x-forms.checkbox>
            <x-forms.checkbox label="View Sensitive Data" wire:model.live="viewSensitiveData"></x-forms.checkbox>
        </div>
--- a/resources/views/livewire/server/form.blade.php
+++ b/resources/views/livewire/server/form.blade.php
@@ -141,7 +141,7 @@
                            </div>
                        @endif
                        @if (!$server->settings->is_cloudflare_tunnel && $server->isFunctional())
-                            <x-modal-input buttonTitle="Automated Configuration" title="Cloudflare Tunnels" class="w-full">
+                            <x-modal-input buttonTitle="Automated Configuration" title="Cloudflare Tunnels" class="w-full" :closeOutside="false">
                                <livewire:server.configure-cloudflare-tunnels :server_id="$server->id" />
                            </x-modal-input>
                        @endif
--- a/resources/views/livewire/storage/create.blade.php
+++ b/resources/views/livewire/storage/create.blade.php
@@ -4,7 +4,7 @@
            <x-forms.input required label="Name" id="name" />
            <x-forms.input label="Description" id="description" />
        </div>
-        <x-forms.input required type="url" label="Endpoint" id="endpoint" />
+        <x-forms.input required type="url" label="Endpoint" wire:model.blur="endpoint" />
        <div class="flex gap-2">
            <x-forms.input required label="Bucket" id="bucket" />
            <x-forms.input required label="Region" id="region" />
--- a/versions.json
+++ b/versions.json
@@ -1,16 +1,16 @@
 {
    "coolify": {
        "v4": {
-            "version": "4.0.0-beta.349"
+            "version": "4.0.0-beta.350"
        },
        "nightly": {
-            "version": "4.0.0-beta.350"
+            "version": "4.0.0-beta.351"
        },
        "helper": {
            "version": "1.0.1"
        },
        "realtime": {
-            "version": "1.0.2"
+            "version": "1.0.3"
        }
    }
 }