refactor: Remove CleanupSshKeysJob from schedule in Kernel.php

app/Console/Kernel.php

@@ -4,7 +4,6 @@ namespace App\Console;
 
 use App\Jobs\CheckForUpdatesJob;
 use App\Jobs\CleanupInstanceStuffsJob;
-use App\Jobs\CleanupSshKeysJob;
 use App\Jobs\CleanupStaleMultiplexedConnections;
 use App\Jobs\DatabaseBackupJob;
 use App\Jobs\DockerCleanupJob;
@@ -45,7 +44,6 @@ class Kernel extends ConsoleKernel
 
             $schedule->command('telescope:prune')->daily();
 
-            $schedule->job(new CleanupSshKeysJob)->weekly()->onOneServer();
             $schedule->job(new PullHelperImageJob)->everyFiveMinutes()->onOneServer();
         } else {
             // Instance Jobs
@@ -63,8 +61,6 @@ class Kernel extends ConsoleKernel
 
             $schedule->command('cleanup:database --yes')->daily();
             $schedule->command('uploads:clear')->everyTwoMinutes();
-
-            $schedule->job(new CleanupSshKeysJob)->weekly()->onOneServer();
         }
     }
 

app/Helpers/SshMultiplexingHelper.php

@@ -2,10 +2,10 @@
 
 namespace App\Helpers;
 
-use App\Models\Server;
 use App\Models\PrivateKey;
-use Illuminate\Support\Facades\Process;
+use App\Models\Server;
 use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Process;
 
 class SshMultiplexingHelper
 {
@@ -127,7 +127,7 @@ class SshMultiplexingHelper
 
         self::addCloudflareProxyCommand($scp_command, $server);
 
-        $scp_command .= self::getCommonSshOptions($server, $sshKeyLocation, config('constants.ssh.connection_timeout'), config('constants.ssh.server_interval'));
+        $scp_command .= self::getCommonSshOptions($server, $sshKeyLocation, config('constants.ssh.connection_timeout'), config('constants.ssh.server_interval'), isScp: true);
         $scp_command .= "{$source} {$server->user}@{$server->ip}:{$dest}";
 
         return $scp_command;
@@ -190,15 +190,23 @@ class SshMultiplexingHelper
         }
     }
 
-    private static function getCommonSshOptions(Server $server, string $sshKeyLocation, int $connectionTimeout, int $serverInterval): string
+    private static function getCommonSshOptions(Server $server, string $sshKeyLocation, int $connectionTimeout, int $serverInterval, bool $isScp = false): string
     {
-        return "-i {$sshKeyLocation} "
+        $options = "-i {$sshKeyLocation} "
             .'-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null '
             .'-o PasswordAuthentication=no '
             ."-o ConnectTimeout=$connectionTimeout "
             ."-o ServerAliveInterval=$serverInterval "
             .'-o RequestTTY=no '
-            .'-o LogLevel=ERROR '
+            .'-o LogLevel=ERROR ';
-            ."-p {$server->port} ";
+
+        // Bruh
+        if ($isScp) {
+            $options .= "-P {$server->port} ";
+        } else {
+            $options .= "-p {$server->port} ";
+        }
+
+        return $options;
     }
 }

app/Livewire/Server/ShowPrivateKey.php

@@ -2,9 +2,9 @@
 
 namespace App\Livewire\Server;
 
+use App\Models\PrivateKey;
 use App\Models\Server;
 use Livewire\Component;
-use App\Models\PrivateKey;
 
 class ShowPrivateKey extends Component
 {
@@ -34,7 +34,7 @@ class ShowPrivateKey extends Component
                 $this->dispatch('success', 'Server is reachable.');
             } else {
                 ray($error);
-                $this->dispatch('error', 'Server is not reachable.<br>Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a> for further help.');
+                $this->dispatch('error', 'Server is not reachable.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a> for further help.<br><br>Error: '.$error);
 
                 return;
             }

bootstrap/helpers/remoteProcess.php

@@ -11,8 +11,8 @@ use App\Models\Server;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Process;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Process;
 use Illuminate\Support\Str;
 use Spatie\Activitylog\Contracts\Activity;
 
@@ -67,6 +67,7 @@ function instant_scp(string $source, string $dest, Server $server, $throwError =
     if ($exitCode !== 0) {
         return $throwError ? excludeCertainErrors($process->errorOutput(), $exitCode) : null;
     }
+
     return $output === 'null' ? null : $output;
 }
 
@@ -92,6 +93,7 @@ function instant_remote_process(Collection|array $command, Server $server, bool
     if ($exitCode !== 0) {
         return $throwError ? excludeCertainErrors($process->errorOutput(), $exitCode) : null;
     }
+
     return $output === 'null' ? null : $output;
 }
 
@@ -130,10 +132,12 @@ function decode_remote_command_output(?ApplicationDeploymentQueue $application_d
     if (! $is_debug_enabled) {
         $formatted = $formatted->filter(fn ($i) => $i['hidden'] === false ?? false);
     }
+
     return $formatted
         ->sortBy(fn ($i) => data_get($i, 'order'))
         ->map(function ($i) {
             data_set($i, 'timestamp', Carbon::parse(data_get($i, 'timestamp'))->format('Y-M-d H:i:s.u'));
+
             return $i;
         })
         ->reduce(function ($deploymentLogLines, $logItem) use ($seenCommands) {
@@ -176,6 +180,7 @@ function decode_remote_command_output(?ApplicationDeploymentQueue $application_d
 function remove_iip($text)
 {
     $text = preg_replace('/x-access-token:.*?(?=@)/', 'x-access-token:'.REDACTED, $text);
+
     return preg_replace('/\x1b\[[0-9;]*m/', '', $text);
 }