Abstracted deployment code into a job.

app/Actions/RemoteProcess/DispatchRemoteProcess.php

@@ -3,7 +3,6 @@
 namespace App\Actions\RemoteProcess;
 
 use App\Data\RemoteProcessArgs;
-use App\Jobs\DeployRemoteProcess;
 use App\Jobs\ExecuteRemoteProcess;
 use Spatie\Activitylog\Models\Activity;
 

app/Http/Controllers/ProjectController.php

@@ -17,6 +17,7 @@ class ProjectController extends Controller
         }
         return view('project.environments', ['project' => $project]);
     }
+
     public function resources()
     {
         $project = session('currentTeam')->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
@@ -29,6 +30,7 @@ class ProjectController extends Controller
         }
         return view('project.resources', ['project' => $project, 'environment' => $environment]);
     }
+
     public function application()
     {
         $project = session('currentTeam')->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
@@ -62,7 +64,9 @@ class ProjectController extends Controller
         if (!$application) {
             return redirect()->route('home');
         }
-        $activity = $application->get_deployment($deployment_uuid);
+
-        return view('project.deployment', ['activity' => $activity]);
+        return view('project.deployment', [
+            'deployment_uuid' => $deployment_uuid,
+        ]);
     }
 }

app/Http/Livewire/DeployApplication.php

@@ -3,6 +3,7 @@
 namespace App\Http\Livewire;
 
 use App\Jobs\ContainerStatusJob;
+use App\Jobs\DeployApplicationJob;
 use App\Models\Application;
 use App\Models\CoolifyInstanceSettings;
 use DateTimeImmutable;
@@ -35,210 +36,22 @@ class DeployApplication extends Component
         $this->application = Application::where('uuid', $this->application_uuid)->first();
         $this->destination = $this->application->destination->getMorphClass()::where('id', $this->application->destination->id)->first();
     }
+
     public function render()
     {
         return view('livewire.deploy-application');
     }
-    private function execute_in_builder(string $command)
+
-    {
+
-        return $this->command[] = "docker exec {$this->deployment_uuid} bash -c '{$command}'";
-        // if ($this->application->settings->is_debug) {
-        // } else {
-        //     return $this->command[] = "docker exec {$this->deployment_uuid} bash -c '{$command}'";
-        // }
-    }
-    private function start_builder_container()
-    {
-        $this->command[] = "docker run --pull=always -d --name {$this->deployment_uuid} --rm -v /var/run/docker.sock:/var/run/docker.sock ghcr.io/coollabsio/coolify-builder >/dev/null 2>&1";
-    }
-    private function generate_docker_compose()
-    {
-        $docker_compose = [
-            'version' => '3.8',
-            'services' => [
-                $this->application->uuid => [
-                    'image' => "{$this->application->uuid}:TAG",
-                    'container_name' => $this->application->uuid,
-                    'restart' => 'always',
-                    'labels' => $this->set_labels_for_applications(),
-                    'expose' => $this->application->ports_exposes,
-                    'networks' => [
-                        $this->destination->network,
-                    ],
-                    'healthcheck' => [
-                        'test' => [
-                            'CMD-SHELL',
-                            $this->generate_healthcheck_commands()
-                        ],
-                        'interval' => $this->application->health_check_interval . 's',
-                        'timeout' => $this->application->health_check_timeout . 's',
-                        'retries' => $this->application->health_check_retries,
-                        'start_period' => $this->application->health_check_start_period . 's'
-                    ],
-                ]
-            ],
-            'networks' => [
-                $this->destination->network => [
-                    'external' => false,
-                    'name' => $this->destination->network,
-                    'attachable' => true,
-                ]
-            ]
-        ];
-        if (count($this->application->ports_mappings) > 0) {
-            $docker_compose['services'][$this->application->uuid]['ports'] = $this->application->ports_mappings;
-        }
-        // if (count($volumes) > 0) {
-        //     $docker_compose['services'][$this->application->uuid]['volumes'] = $volumes;
-        // }
-        // if (count($volume_names) > 0) {
-        //     $docker_compose['volumes'] = $volume_names;
-        // }
-        return Yaml::dump($docker_compose);
-    }
-    private function set_labels_for_applications()
-    {
-        $labels = [];
-        $labels[] = 'coolify.managed=true';
-        $labels[] = 'coolify.version=' . config('coolify.version');
-        $labels[] = 'coolify.applicationId=' . $this->application->id;
-        $labels[] = 'coolify.type=application';
-        $labels[] = 'coolify.name=' . $this->application->name;
-        if ($this->application->fqdn) {
-            $labels[] = "traefik.http.routers.container.rule=Host(`{$this->application->fqdn}`)";
-        }
-        return $labels;
-    }
-    private function generate_healthcheck_commands()
-    {
-        if (!$this->application->health_check_port) {
-            $this->application->health_check_port = $this->application->ports_exposes[0];
-        }
-        if ($this->application->health_check_path) {
-            $generated_healthchecks_commands = [
-                "curl -X {$this->application->health_check_method} -f {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$this->application->health_check_port}{$this->application->health_check_path}"
-            ];
-        } else {
-            $generated_healthchecks_commands = [];
-            foreach ($this->application->ports_exposes as $key => $port) {
-                $generated_healthchecks_commands = [
-                    "curl -X {$this->application->health_check_method} -f {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$port}/"
-                ];
-                if (count($this->application->ports_exposes) != $key + 1) {
-                    $generated_healthchecks_commands[] = '&&';
-                }
-            }
-        }
-        return implode(' ', $generated_healthchecks_commands);
-    }
-    private function generate_jwt_token_for_github()
-    {
-        $signingKey = InMemory::plainText($this->source->privateKey->private_key);
-        $algorithm = new Sha256();
-        $tokenBuilder = (new Builder(new JoseEncoder(), ChainedFormatter::default()));
-        $now = new DateTimeImmutable();
-        $now = $now->setTime($now->format('H'), $now->format('i'));
-        $issuedToken = $tokenBuilder
-            ->issuedBy($this->source->app_id)
-            ->issuedAt($now)
-            ->expiresAt($now->modify('+10 minutes'))
-            ->getToken($algorithm, $signingKey)
-            ->toString();
-        $token = Http::withHeaders([
-            'Authorization' => "Bearer $issuedToken",
-            'Accept' => 'application/vnd.github.machine-man-preview+json'
-        ])->post("{$this->source->api_url}/app/installations/{$this->source->installation_id}/access_tokens");
-        if ($token->failed()) {
-            throw new \Exception("Failed to get access token for $this->application_name from " . $this->source_name . " with error: " . $token->json()['message']);
-        }
-        return $token->json()['token'];
-    }
     public function deploy()
     {
-        $coolify_instance_settings = CoolifyInstanceSettings::find(1);
-        $this->destination = $this->application->destination->getMorphClass()::where('id', $this->application->destination->id)->first();
-        $this->source = $this->application->source->getMorphClass()::where('id', $this->application->source->id)->first();
-
-        $source_html_url = data_get($this->application, 'source.html_url');
-        $url = parse_url(filter_var($source_html_url, FILTER_SANITIZE_URL));
-        $source_html_url_host = $url['host'];
-        $source_html_url_scheme = $url['scheme'];
-
-        // Get Wildcard Domain
-        $project_wildcard_domain = data_get($this->application, 'environment.project.settings.wildcard_domain');
-        $global_wildcard_domain = data_get($coolify_instance_settings, 'wildcard_domain');
-        $wildcard_domain = $project_wildcard_domain ?? $global_wildcard_domain ?? null;
-
         // Create Deployment ID
         $this->deployment_uuid = new Cuid2(7);
 
-        // Set wildcard domain
+        dispatch(new DeployApplicationJob(
-        if (!$this->application->settings->is_bot && !$this->application->fqdn && $wildcard_domain) {
+            deployment_uuid: $this->deployment_uuid,
-            $this->application->fqdn = $this->application->uuid . '.' . $wildcard_domain;
+            application_uuid: $this->application_uuid,
-            $this->application->save();
+        ));
-        }
-        $workdir = "/artifacts/{$this->deployment_uuid}";
-
-        // Start build process
-        $this->command[] = "echo 'Starting deployment of {$this->application->git_repository}:{$this->application->git_branch}...'";
-        $this->command[] = "echo -n 'Pulling latest version of the builder image (ghcr.io/coollabsio/coolify-builder)... '";
-        $this->start_builder_container();
-        $this->command[] = "echo 'Done.'";
-        $this->command[] = "echo -n 'Importing {$this->application->git_repository}:{$this->application->git_branch} to {$workdir}... '";
-        if ($this->application->source->getMorphClass() == 'App\Models\GithubApp') {
-            if ($this->source->is_public) {
-                $this->execute_in_builder("git clone -q -b {$this->application->git_branch} {$this->source->html_url}/{$this->application->git_repository}.git {$workdir}");
-            } else {
-                $github_access_token = $this->generate_jwt_token_for_github();
-                $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 {$workdir}");
-            }
-        }
-        $this->command[] = "echo 'Done.'";
-        // Export git commit to a file
-        $this->command[] = "echo -n 'Checking commit sha... '";
-        $this->execute_in_builder("cd {$workdir} && git rev-parse HEAD > {$workdir}/.git-commit");
-        $this->command[] = "echo 'Done.'";
-        // Remove .git folder
-        $this->command[] = "echo -n 'Removing .git folder... '";
-        $this->execute_in_builder("rm -fr {$workdir}/.git");
-        $this->command[] = "echo 'Done.'";
-        // Create docker-compose.yml && replace TAG with git commit
-        $docker_compose_base64 = base64_encode($this->generate_docker_compose($this->application));
-        $this->execute_in_builder("echo '{$docker_compose_base64}' | base64 -d > {$workdir}/docker-compose.yml");
-        $this->execute_in_builder("sed -i \"s/TAG/$(cat {$workdir}/.git-commit)/g\" {$workdir}/docker-compose.yml");
-
-        $this->command[] = "echo -n 'Generating nixpacks configuration... '";
-        if (str_starts_with($this->application->base_image, 'apache') || str_starts_with($this->application->base_image, 'nginx')) {
-            // @TODO: Add static site builds
-        } else {
-            $nixpacks_command = "nixpacks build -o {$workdir} --no-error-without-start";
-            if ($this->application->install_command) {
-                $nixpacks_command .= " --install-cmd '{$this->application->install_command}'";
-            }
-            if ($this->application->build_command) {
-                $nixpacks_command .= " --build-cmd '{$this->application->build_command}'";
-            }
-            if ($this->application->start_command) {
-                $nixpacks_command .= " --start-cmd '{$this->application->start_command}'";
-            }
-            $nixpacks_command .= " {$workdir}";
-            $this->execute_in_builder($nixpacks_command);
-            $this->execute_in_builder("cp {$workdir}/.nixpacks/Dockerfile {$workdir}/Dockerfile");
-            $this->execute_in_builder("rm -f {$workdir}/.nixpacks/Dockerfile");
-        }
-        $this->command[] = "echo 'Done.'";
-        $this->command[] = "echo -n 'Building image... '";
-
-        $this->execute_in_builder("docker build -f {$workdir}/Dockerfile --build-arg SOURCE_COMMIT=$(cat {$workdir}/.git-commit) --progress plain -t {$this->application->uuid}:$(cat {$workdir}/.git-commit) {$workdir}");
-        $this->command[] = "echo 'Done.'";
-        $this->execute_in_builder("docker rm -f {$this->application->uuid} >/dev/null 2>&1");
-
-        $this->command[] = "echo -n 'Deploying... '";
-
-        $this->execute_in_builder("docker compose --project-directory {$workdir} up -d");
-        $this->command[] = "echo 'Done. 🎉'";
-        $this->command[] = "docker stop -t 0 {$this->deployment_uuid} >/dev/null";
-        $this->activity = remoteProcess($this->command, $this->destination->server, $this->deployment_uuid, $this->application);
 
         $currentUrl = url()->previous();
         $deploymentUrl = "$currentUrl/deployment/$this->deployment_uuid";
@@ -251,10 +64,12 @@ class DeployApplication extends Component
         $this->application->status = 'exited';
         $this->application->save();
     }
+
     public function pollingStatus()
     {
         $this->application->refresh();
     }
+
     public function checkStatus()
     {
         $output = runRemoteCommandSync($this->destination->server, ["docker ps -a --format '{{.State}}' --filter 'name={$this->application->uuid}'"]);

app/Http/Livewire/PollActivity.php

@@ -3,15 +3,23 @@
 namespace App\Http\Livewire;
 
 use Livewire\Component;
+use Spatie\Activitylog\Models\Activity;
 
 class PollActivity extends Component
 {
     public $activity;
     public $isKeepAliveOn = true;
+    public $deployment_uuid;
 
     public function polling()
     {
+        if ( is_null($this->activity) && isset($this->deployment_uuid)) {
+            $this->activity = Activity::where('properties->deployment_uuid', '=', $this->deployment_uuid)
+                ->first();
+        } else {
             $this->activity?->refresh();
+        }
+
         if (data_get($this->activity, 'properties.exitCode') !== null) {
             $this->isKeepAliveOn = false;
         }

app/Jobs/DeployApplicationJob.php

@@ -0,0 +1,248 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\Application;
+use App\Models\CoolifyInstanceSettings;
+use DateTimeImmutable;
+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;
+use Illuminate\Support\Facades\Http;
+use Lcobucci\JWT\Encoding\ChainedFormatter;
+use Lcobucci\JWT\Encoding\JoseEncoder;
+use Lcobucci\JWT\Signer\Key\InMemory;
+use Lcobucci\JWT\Signer\Rsa\Sha256;
+use Lcobucci\JWT\Token\Builder;
+use Symfony\Component\Yaml\Yaml;
+
+class DeployApplicationJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    protected $application;
+    protected $destination;
+    protected $source;
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct(
+        public string $deployment_uuid,
+        public string $application_uuid,
+    ){}
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        $this->application = Application::query()
+            ->where('uuid', $this->application_uuid)
+            ->firstOrFail();
+
+        $coolify_instance_settings = CoolifyInstanceSettings::find(1);
+
+        $this->destination = $this->application->destination->getMorphClass()::where('id', $this->application->destination->id)->first();
+        $this->source = $this->application->source->getMorphClass()::where('id', $this->application->source->id)->first();
+
+        $source_html_url = data_get($this->application, 'source.html_url');
+        $url = parse_url(filter_var($source_html_url, FILTER_SANITIZE_URL));
+        $source_html_url_host = $url['host'];
+        $source_html_url_scheme = $url['scheme'];
+
+        // Get Wildcard Domain
+        $project_wildcard_domain = data_get($this->application, 'environment.project.settings.wildcard_domain');
+        $global_wildcard_domain = data_get($coolify_instance_settings, 'wildcard_domain');
+        $wildcard_domain = $project_wildcard_domain ?? $global_wildcard_domain ?? null;
+
+        // Set wildcard domain
+        if (!$this->application->settings->is_bot && !$this->application->fqdn && $wildcard_domain) {
+            $this->application->fqdn = $this->application->uuid . '.' . $wildcard_domain;
+            $this->application->save();
+        }
+        $workdir = "/artifacts/{$this->deployment_uuid}";
+
+        // Start build process
+        $this->command[] = "echo 'Starting deployment of {$this->application->git_repository}:{$this->application->git_branch}...'";
+        $this->command[] = "echo -n 'Pulling latest version of the builder image (ghcr.io/coollabsio/coolify-builder)... '";
+        $this->start_builder_container();
+        $this->command[] = "echo 'Done.'";
+        $this->command[] = "echo -n 'Importing {$this->application->git_repository}:{$this->application->git_branch} to {$workdir}... '";
+        if ($this->application->source->getMorphClass() == 'App\Models\GithubApp') {
+            if ($this->source->is_public) {
+                $this->execute_in_builder("git clone -q -b {$this->application->git_branch} {$this->source->html_url}/{$this->application->git_repository}.git {$workdir}");
+            } else {
+                $github_access_token = $this->generate_jwt_token_for_github();
+                $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 {$workdir}");
+            }
+        }
+        $this->command[] = "echo 'Done.'";
+        // Export git commit to a file
+        $this->command[] = "echo -n 'Checking commit sha... '";
+        $this->execute_in_builder("cd {$workdir} && git rev-parse HEAD > {$workdir}/.git-commit");
+        $this->command[] = "echo 'Done.'";
+        // Remove .git folder
+        $this->command[] = "echo -n 'Removing .git folder... '";
+        $this->execute_in_builder("rm -fr {$workdir}/.git");
+        $this->command[] = "echo 'Done.'";
+        // Create docker-compose.yml && replace TAG with git commit
+        $docker_compose_base64 = base64_encode($this->generate_docker_compose($this->application));
+        $this->execute_in_builder("echo '{$docker_compose_base64}' | base64 -d > {$workdir}/docker-compose.yml");
+        $this->execute_in_builder("sed -i \"s/TAG/$(cat {$workdir}/.git-commit)/g\" {$workdir}/docker-compose.yml");
+
+
+        $this->command[] = "echo -n 'Generating nixpacks configuration... '";
+        if (str_starts_with($this->application->base_image, 'apache') || str_starts_with($this->application->base_image, 'nginx')) {
+            // @TODO: Add static site builds
+        } else {
+            $nixpacks_command = "nixpacks build -o {$workdir} --no-error-without-start";
+            if ($this->application->install_command) {
+                $nixpacks_command .= " --install-cmd '{$this->application->install_command}'";
+            }
+            if ($this->application->build_command) {
+                $nixpacks_command .= " --build-cmd '{$this->application->build_command}'";
+            }
+            if ($this->application->start_command) {
+                $nixpacks_command .= " --start-cmd '{$this->application->start_command}'";
+            }
+            $nixpacks_command .= " {$workdir}";
+            $this->execute_in_builder($nixpacks_command);
+            $this->execute_in_builder("cp {$workdir}/.nixpacks/Dockerfile {$workdir}/Dockerfile");
+            $this->execute_in_builder("rm -f {$workdir}/.nixpacks/Dockerfile");
+        }
+        $this->command[] = "echo 'Done.'";
+        $this->command[] = "echo -n 'Building image... '";
+
+        $this->execute_in_builder("docker build -f {$workdir}/Dockerfile --build-arg SOURCE_COMMIT=$(cat {$workdir}/.git-commit) --progress plain -t {$this->application->uuid}:$(cat {$workdir}/.git-commit) {$workdir}");
+        $this->command[] = "echo 'Done.'";
+        $this->execute_in_builder("docker rm -f {$this->application->uuid} >/dev/null 2>&1");
+
+        $this->command[] = "echo -n 'Deploying... '";
+
+        $this->execute_in_builder("docker compose --project-directory {$workdir} up -d");
+        $this->command[] = "echo 'Done. 🎉'";
+        $this->command[] = "docker stop -t 0 {$this->deployment_uuid} >/dev/null";
+
+        remoteProcess($this->command, $this->destination->server, $this->deployment_uuid, $this->application);
+    }
+
+    private function start_builder_container()
+    {
+        $this->command[] = "docker run --pull=always -d --name {$this->deployment_uuid} --rm -v /var/run/docker.sock:/var/run/docker.sock ghcr.io/coollabsio/coolify-builder >/dev/null 2>&1";
+    }
+
+    private function execute_in_builder(string $command)
+    {
+        return $this->command[] = "docker exec {$this->deployment_uuid} bash -c '{$command}'";
+    }
+
+    private function generate_docker_compose()
+    {
+        $docker_compose = [
+            'version' => '3.8',
+            'services' => [
+                $this->application->uuid => [
+                    'image' => "{$this->application->uuid}:TAG",
+                    'container_name' => $this->application->uuid,
+                    'restart' => 'always',
+                    'labels' => $this->set_labels_for_applications(),
+                    'expose' => $this->application->ports_exposes,
+                    'networks' => [
+                        $this->destination->network,
+                    ],
+                    'healthcheck' => [
+                        'test' => [
+                            'CMD-SHELL',
+                            $this->generate_healthcheck_commands()
+                        ],
+                        'interval' => $this->application->health_check_interval . 's',
+                        'timeout' => $this->application->health_check_timeout . 's',
+                        'retries' => $this->application->health_check_retries,
+                        'start_period' => $this->application->health_check_start_period . 's'
+                    ],
+                ]
+            ],
+            'networks' => [
+                $this->destination->network => [
+                    'external' => false,
+                    'name' => $this->destination->network,
+                    'attachable' => true,
+                ]
+            ]
+        ];
+        if (count($this->application->ports_mappings) > 0) {
+            $docker_compose['services'][$this->application->uuid]['ports'] = $this->application->ports_mappings;
+        }
+        // if (count($volumes) > 0) {
+        //     $docker_compose['services'][$this->application->uuid]['volumes'] = $volumes;
+        // }
+        // if (count($volume_names) > 0) {
+        //     $docker_compose['volumes'] = $volume_names;
+        // }
+        return Yaml::dump($docker_compose);
+    }
+
+    private function generate_healthcheck_commands()
+    {
+        if (!$this->application->health_check_port) {
+            $this->application->health_check_port = $this->application->ports_exposes[0];
+        }
+        if ($this->application->health_check_path) {
+            $generated_healthchecks_commands = [
+                "curl -X {$this->application->health_check_method} -f {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$this->application->health_check_port}{$this->application->health_check_path}"
+            ];
+        } else {
+            $generated_healthchecks_commands = [];
+            foreach ($this->application->ports_exposes as $key => $port) {
+                $generated_healthchecks_commands = [
+                    "curl -X {$this->application->health_check_method} -f {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$port}/"
+                ];
+                if (count($this->application->ports_exposes) != $key + 1) {
+                    $generated_healthchecks_commands[] = '&&';
+                }
+            }
+        }
+        return implode(' ', $generated_healthchecks_commands);
+    }
+
+    private function generate_jwt_token_for_github()
+    {
+        $signingKey = InMemory::plainText($this->source->privateKey->private_key);
+        $algorithm = new Sha256();
+        $tokenBuilder = (new Builder(new JoseEncoder(), ChainedFormatter::default()));
+        $now = new DateTimeImmutable();
+        $now = $now->setTime($now->format('H'), $now->format('i'));
+        $issuedToken = $tokenBuilder
+            ->issuedBy($this->source->app_id)
+            ->issuedAt($now)
+            ->expiresAt($now->modify('+10 minutes'))
+            ->getToken($algorithm, $signingKey)
+            ->toString();
+        $token = Http::withHeaders([
+            'Authorization' => "Bearer $issuedToken",
+            'Accept' => 'application/vnd.github.machine-man-preview+json'
+        ])->post("{$this->source->api_url}/app/installations/{$this->source->installation_id}/access_tokens");
+        if ($token->failed()) {
+            throw new \Exception("Failed to get access token for $this->application->name from " . $this->source->name . " with error: " . $token->json()['message']);
+        }
+        return $token->json()['token'];
+    }
+
+    private function set_labels_for_applications()
+    {
+        $labels = [];
+        $labels[] = 'coolify.managed=true';
+        $labels[] = 'coolify.version=' . config('coolify.version');
+        $labels[] = 'coolify.applicationId=' . $this->application->id;
+        $labels[] = 'coolify.type=application';
+        $labels[] = 'coolify.name=' . $this->application->name;
+        if ($this->application->fqdn) {
+            $labels[] = "traefik.http.routers.container.rule=Host(`{$this->application->fqdn}`)";
+        }
+        return $labels;
+    }
+}

bootstrap/helpers.php

@@ -20,8 +20,8 @@ if (!function_exists('remoteProcess')) {
     function remoteProcess(
         array           $command,
         Server          $server,
-        string|null     $deployment_uuid = null,
+        ?string         $deployment_uuid = null,
-        Model|null      $model = null,
+        ?Model          $model = null,
     ): Activity {
         $command_string = implode("\n", $command);
         // @TODO: Check if the user has access to this server
@@ -31,19 +31,21 @@ if (!function_exists('remoteProcess')) {
 
         return resolve(DispatchRemoteProcess::class, [
             'remoteProcessArgs' => new RemoteProcessArgs(
-                type: $deployment_uuid ? ActivityTypes::DEPLOYMENT->value : ActivityTypes::REMOTE_PROCESS->value,
                 model: $model,
                 server_ip: $server->ip,
-                deployment_uuid: $deployment_uuid,
                 private_key_location: $private_key_location,
+                deployment_uuid: $deployment_uuid,
                 command: <<<EOT
                 {$command_string}
                 EOT,
                 port: $server->port,
                 user: $server->user,
+                type: $deployment_uuid ? ActivityTypes::DEPLOYMENT->value : ActivityTypes::REMOTE_PROCESS->value,
             ),
         ])();
     }
+}
+
 // function checkTeam(string $team_id)
 // {
 //     $found_team = auth()->user()->teams->pluck('id')->contains($team_id);
@@ -51,7 +53,6 @@ if (!function_exists('remoteProcess')) {
 //         throw new \RuntimeException('You do not have access to this server.');
 //     }
 // }
-}
 
 if (!function_exists('savePrivateKey')) {
     function savePrivateKey(Server $server)

resources/views/livewire/poll-activity.blade.php

@@ -1,6 +1,5 @@
 <div>
-    @isset($activity?->id)
+    <pre style="width: 100%;overflow-y: scroll;" @if ($isKeepAliveOn) wire:poll.750ms="polling" @endif>
-        <pre style="width: 100%;overflow-y: scroll;" @if ($isKeepAliveOn) wire:poll.750ms="polling" @endif>{{ data_get($activity, 'description') }}</pre>
+        {{ data_get($activity, 'description') }}
-    @endisset
+    </pre>
-    {{-- <pre style="width: 100%;overflow-y: scroll;">{{ data_get($activity, 'properties') }}</pre> --}}
 </div>

resources/views/project/deployment.blade.php

@@ -1,4 +1,4 @@
 <x-layout>
     <h1>Deployment</h1>
-    <livewire:poll-activity :activity="$activity" />
+    <livewire:poll-activity :activity="null" :deployment_uuid="$deployment_uuid" />
 </x-layout>