Fix 500 on duplicate ports (#861)

* Fix 500 on duplicate ports

This should also address N+1 issues from the last PR

* Combine into one method

* Pint

* Add missing type

* Add 0.0.0.0

* Add notifications to help the user

* Pint

* Too verbose

* Show notification here

* Simplify code

* Reset the ports if the ip changes

* Don’t limit these anymore

---------

Co-authored-by: Lance Pioch <git@lance.sh>

.github/docker/entrypoint.sh

@@ -52,11 +52,11 @@ crond -L /var/log/crond -l 5
 export SUPERVISORD_CADDY=false
 
 ## disable caddy if SKIP_CADDY is set
-if [[ -z $SKIP_CADDY ]]; then
+if [[ "${SKIP_CADDY:-}" == "true" ]]; then
+  echo "Starting PHP-FPM only"
+else
   echo "Starting PHP-FPM and Caddy"
   export SUPERVISORD_CADDY=true
-else
-  echo "Starting PHP-FPM only"
 fi
 
 chown -R www-data:www-data /pelican-data/.env /pelican-data/database

.github/workflows/ci.yaml

@@ -87,7 +87,7 @@ jobs:
       fail-fast: false
       matrix:
         php: [8.2, 8.3]
-        database: ["mariadb:10.3", "mariadb:10.11", "mariadb:11.4"]
+        database: ["mariadb:10.6", "mariadb:10.11", "mariadb:11.4"]
     services:
       database:
         image: ${{ matrix.database }}

app/Checks/NodeVersionsCheck.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Checks;
+
+use App\Models\Node;
+use App\Services\Helpers\SoftwareVersionService;
+use Spatie\Health\Checks\Check;
+use Spatie\Health\Checks\Result;
+use Spatie\Health\Enums\Status;
+
+class NodeVersionsCheck extends Check
+{
+    public function __construct(private SoftwareVersionService $versionService) {}
+
+    public function run(): Result
+    {
+        $all = Node::query()->count();
+
+        if ($all === 0) {
+            $result = Result::make()->notificationMessage('No Nodes created')->shortSummary('No Nodes');
+            $result->status = Status::skipped();
+
+            return $result;
+        }
+
+        $latestVersion = $this->versionService->latestWingsVersion();
+
+        $outdated = Node::query()->get()
+            ->filter(fn (Node $node) => !isset($node->systemInformation()['exception']) && $node->systemInformation()['version'] !== $latestVersion)
+            ->count();
+
+        $result = Result::make()
+            ->meta([
+                'all' => $all,
+                'outdated' => $outdated,
+            ])
+            ->shortSummary($outdated === 0 ? 'All up-to-date' : "{$outdated}/{$all} outdated");
+
+        return $outdated === 0
+            ? $result->ok('All Nodes are up-to-date.')
+            : $result->failed(':outdated/:all Nodes are outdated.');
+    }
+}

app/Checks/PanelVersionCheck.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Checks;
+
+use App\Services\Helpers\SoftwareVersionService;
+use Spatie\Health\Checks\Check;
+use Spatie\Health\Checks\Result;
+
+class PanelVersionCheck extends Check
+{
+    public function __construct(private SoftwareVersionService $versionService) {}
+
+    public function run(): Result
+    {
+        $isLatest = $this->versionService->isLatestPanel();
+        $currentVersion = $this->versionService->currentPanelVersion();
+        $latestVersion = $this->versionService->latestPanelVersion();
+
+        $result = Result::make()
+            ->meta([
+                'isLatest' => $isLatest,
+                'currentVersion' => $currentVersion,
+                'latestVersion' => $latestVersion,
+            ])
+            ->shortSummary($isLatest ? 'up-to-date' : 'outdated');
+
+        return $isLatest
+            ? $result->ok('Panel is up-to-date.')
+            : $result->failed('Installed version is `:currentVersion` but latest is `:latestVersion`.');
+    }
+}

app/Checks/UsedDiskSpaceCheck.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Checks;
+
+use Spatie\Health\Checks\Checks\UsedDiskSpaceCheck as BaseCheck;
+
+class UsedDiskSpaceCheck extends BaseCheck
+{
+    protected function getDiskUsagePercentage(): int
+    {
+        $freeSpace = disk_free_space($this->filesystemName ?? '/');
+        $totalSpace = disk_total_space($this->filesystemName ?? '/');
+
+        return 100 - ($freeSpace * 100 / $totalSpace);
+    }
+}

app/Console/Commands/InfoCommand.php

@@ -3,7 +3,6 @@
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
-use App\Services\Helpers\SoftwareVersionService;
 
 class InfoCommand extends Command
 {
@@ -11,98 +10,8 @@ class InfoCommand extends Command
 
     protected $signature = 'p:info';
 
-    /**
-     * InfoCommand constructor.
-     */
-    public function __construct(private SoftwareVersionService $versionService)
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Handle execution of command.
-     */
     public function handle(): void
     {
-        $this->output->title('Version Information');
-        $this->table([], [
-            ['Panel Version', $this->versionService->versionData()['version']],
-            ['Latest Version', $this->versionService->getPanel()],
-            ['Up-to-Date', $this->versionService->isLatestPanel() ? 'Yes' : $this->formatText('No', 'bg=red')],
-        ], 'compact');
-
-        $this->output->title('Application Configuration');
-        $this->table([], [
-            ['Environment', config('app.env') === 'production' ? config('app.env') : $this->formatText(config('app.env'), 'bg=red')],
-            ['Debug Mode', config('app.debug') ? $this->formatText('Yes', 'bg=red') : 'No'],
-            ['Application Name', config('app.name')],
-            ['Application URL', config('app.url')],
-            ['Installation Directory', base_path()],
-            ['Cache Driver', config('cache.default')],
-            ['Queue Driver', config('queue.default') === 'sync' ? $this->formatText(config('queue.default'), 'bg=red') : config('queue.default')],
-            ['Session Driver', config('session.driver')],
-            ['Filesystem Driver', config('filesystems.default')],
-        ], 'compact');
-
-        $this->output->title('Database Configuration');
-        $driver = config('database.default');
-        if ($driver === 'sqlite') {
-            $this->table([], [
-                ['Driver', $driver],
-                ['Database', config("database.connections.$driver.database")],
-            ], 'compact');
-        } else {
-            $this->table([], [
-                ['Driver', $driver],
-                ['Host', config("database.connections.$driver.host")],
-                ['Port', config("database.connections.$driver.port")],
-                ['Database', config("database.connections.$driver.database")],
-                ['Username', config("database.connections.$driver.username")],
-            ], 'compact');
-        }
-
-        $this->output->title('Email Configuration');
-        $driver = config('mail.default');
-        if ($driver === 'smtp') {
-            $this->table([], [
-                ['Driver', $driver],
-                ['Host', config("mail.mailers.$driver.host")],
-                ['Port', config("mail.mailers.$driver.port")],
-                ['Username', config("mail.mailers.$driver.username")],
-                ['Encryption', config("mail.mailers.$driver.encryption")],
-                ['From Address', config('mail.from.address')],
-                ['From Name', config('mail.from.name')],
-            ], 'compact');
-        } else {
-            $this->table([], [
-                ['Driver', $driver],
-                ['From Address', config('mail.from.address')],
-                ['From Name', config('mail.from.name')],
-            ], 'compact');
-        }
-
-        $this->output->title('Backup Configuration');
-        $driver = config('backups.default');
-        if ($driver === 's3') {
-            $this->table([], [
-                ['Driver', $driver],
-                ['Region', config("backups.disks.$driver.region")],
-                ['Bucket', config("backups.disks.$driver.bucket")],
-                ['Endpoint', config("backups.disks.$driver.endpoint")],
-                ['Use path style endpoint', config("backups.disks.$driver.use_path_style_endpoint") ? 'Yes' : 'No'],
-            ], 'compact');
-        } else {
-            $this->table([], [
-                ['Driver', $driver],
-            ], 'compact');
-        }
-    }
-
-    /**
-     * Format output in a Name: Value manner.
-     */
-    private function formatText(string $value, string $opts = ''): string
-    {
-        return sprintf('<%s>%s</>', $opts, $value);
+        $this->call('about');
     }
 }

app/Console/Commands/Server/BulkPowerActionCommand.php

@@ -65,6 +65,7 @@ class BulkPowerActionCommand extends Command
 
         $bar = $this->output->createProgressBar($count);
         $powerRepository = $this->powerRepository;
+        // @phpstan-ignore-next-line
         $this->getQueryBuilder($servers, $nodes)->each(function (Server $server) use ($action, $powerRepository, &$bar) {
             $bar->clear();
 

app/Console/Kernel.php

@@ -9,9 +9,12 @@ use App\Console\Commands\Maintenance\PruneOrphanedBackupsCommand;
 use App\Console\Commands\Schedule\ProcessRunnableCommand;
 use App\Jobs\NodeStatistics;
 use App\Models\ActivityLog;
+use App\Models\Webhook;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Database\Console\PruneCommand;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
+use Spatie\Health\Commands\RunHealthChecksCommand;
+use Spatie\Health\Commands\ScheduleCheckHeartbeatCommand;
 
 class Kernel extends ConsoleKernel
 {
@@ -48,5 +51,12 @@ class Kernel extends ConsoleKernel
         if (config('activity.prune_days')) {
             $schedule->command(PruneCommand::class, ['--model' => [ActivityLog::class]])->daily();
         }
+
+        if (config('panel.webhook.prune_days')) {
+            $schedule->command(PruneCommand::class, ['--model' => [Webhook::class]])->daily();
+        }
+
+        $schedule->command(ScheduleCheckHeartbeatCommand::class)->everyMinute();
+        $schedule->command(RunHealthChecksCommand::class)->everyFiveMinutes();
     }
 }

app/Enums/ContainerStatus.php

@@ -52,4 +52,45 @@ enum ContainerStatus: string
             self::Offline => 'gray',
         };
     }
+
+    public function colorHex(): string
+    {
+        return match ($this) {
+            self::Created, self::Restarting => '#2563EB',
+            self::Starting, self::Paused, self::Removing, self::Stopping => '#D97706',
+            self::Running => '#22C55E',
+            self::Exited, self::Missing, self::Dead, self::Offline => '#EF4444',
+        };
+    }
+
+    public function isStartingOrStopping(): bool
+    {
+        return in_array($this, [ContainerStatus::Starting, ContainerStatus::Stopping, ContainerStatus::Restarting]);
+    }
+
+    public function isStartable(): bool
+    {
+        return !in_array($this, [ContainerStatus::Running, ContainerStatus::Starting, ContainerStatus::Stopping, ContainerStatus::Restarting]);
+    }
+
+    public function isRestartable(): bool
+    {
+        if ($this->isStartable()) {
+            return true;
+        }
+
+        return !in_array($this, [ContainerStatus::Offline]);
+    }
+
+    public function isStoppable(): bool
+    {
+        return !in_array($this, [ContainerStatus::Starting, ContainerStatus::Stopping, ContainerStatus::Restarting, ContainerStatus::Exited, ContainerStatus::Offline]);
+    }
+
+    public function isKillable(): bool
+    {
+        // [ContainerStatus::Restarting, ContainerStatus::Removing, ContainerStatus::Dead, ContainerStatus::Created]
+
+        return !in_array($this, [ContainerStatus::Offline, ContainerStatus::Running, ContainerStatus::Exited]);
+    }
 }

app/Enums/EditorLanguages.php

@@ -0,0 +1,98 @@
+<?php
+
+namespace App\Enums;
+
+use Filament\Support\Contracts\HasLabel;
+
+enum EditorLanguages: string implements HasLabel
+{
+    case plaintext = 'plaintext';
+    case abap = 'abap';
+    case apex = 'apex';
+    case azcali = 'azcali';
+    case bat = 'bat';
+    case bicep = 'bicep';
+    case cameligo = 'cameligo';
+    case coljure = 'coljure';
+    case coffeescript = 'coffeescript';
+    case c = 'c';
+    case cpp = 'cpp';
+    case csharp = 'csharp';
+    case csp = 'csp';
+    case css = 'css';
+    case cypher = 'cypher';
+    case dart = 'dart';
+    case dockerfile = 'dockerfile';
+    case ecl = 'ecl';
+    case elixir = 'elixir';
+    case flow9 = 'flow9';
+    case fsharp = 'fsharp';
+    case go = 'go';
+    case graphql = 'graphql';
+    case handlebars = 'handlebars';
+    case hcl = 'hcl';
+    case html = 'html';
+    case ini = 'ini';
+    case java = 'java';
+    case javascript = 'javascript';
+    case julia = 'julia';
+    case kotlin = 'kotlin';
+    case less = 'less';
+    case lexon = 'lexon';
+    case lua = 'lua';
+    case liquid = 'liquid';
+    case m3 = 'm3';
+    case markdown = 'markdown';
+    case mdx = 'mdx';
+    case mips = 'mips';
+    case msdax = 'msdax';
+    case mysql = 'mysql';
+    case objectivec = 'objective-c';
+    case pascal = 'pascal';
+    case pascaligo = 'pascaligo';
+    case perl = 'perl';
+    case pgsql = 'pgsql';
+    case php = 'php';
+    case pla = 'pla';
+    case postiats = 'postiats';
+    case powerquery = 'powerquery';
+    case powershell = 'powershell';
+    case proto = 'proto';
+    case pug = 'pug';
+    case python = 'python';
+    case qsharp = 'qsharp';
+    case r = 'r';
+    case razor = 'razor';
+    case redis = 'redis';
+    case redshift = 'redshift';
+    case restructuredtext = 'restructuredtext';
+    case ruby = 'ruby';
+    case rust = 'rust';
+    case sb = 'sb';
+    case scala = 'scala';
+    case scheme = 'scheme';
+    case scss = 'scss';
+    case shell = 'shell';
+    case sol = 'sol';
+    case aes = 'aes';
+    case sparql = 'sparql';
+    case sql = 'sql';
+    case st = 'st';
+    case swift = 'swift';
+    case systemverilog = 'systemverilog';
+    case verilog = 'verilog';
+    case tcl = 'tcl';
+    case twig = 'twig';
+    case typescript = 'typescript';
+    case typespec = 'typespec';
+    case vb = 'vb';
+    case wgsl = 'wgsl';
+    case xml = 'xml';
+    case yaml = 'yaml';
+    case json = 'json';
+
+    public function getLabel(): ?string
+    {
+        return $this->name;
+    }
+}

app/Enums/RolePermissionModels.php

@@ -13,4 +13,5 @@ enum RolePermissionModels: string
     case Role = 'role';
     case Server = 'server';
     case User = 'user';
+    case Webhook = 'webhook';
 }

app/Enums/ServerResourceType.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Enums;
+
+enum ServerResourceType
+{
+    case Unit;
+    case Percentage;
+    case Time;
+}

app/Events/ActivityLogged.php

@@ -8,9 +8,7 @@ use Illuminate\Database\Eloquent\Model;
 
 class ActivityLogged extends Event
 {
-    public function __construct(public ActivityLog $model)
-    {
-    }
+    public function __construct(public ActivityLog $model) {}
 
     public function is(string $event): bool
     {

app/Events/Auth/DirectLogin.php

@@ -7,7 +7,5 @@ use App\Events\Event;
 
 class DirectLogin extends Event
 {
-    public function __construct(public User $user, public bool $remember)
-    {
-    }
+    public function __construct(public User $user, public bool $remember) {}
 }

app/Events/Auth/FailedCaptcha.php

@@ -12,7 +12,5 @@ class FailedCaptcha extends Event
     /**
      * Create a new event instance.
      */
-    public function __construct(public string $ip, public string $domain)
-    {
-    }
+    public function __construct(public string $ip, public ?string $message) {}
 }

app/Events/Auth/FailedPasswordReset.php

@@ -12,7 +12,5 @@ class FailedPasswordReset extends Event
     /**
      * Create a new event instance.
      */
-    public function __construct(public string $ip, public string $email)
-    {
-    }
+    public function __construct(public string $ip, public string $email) {}
 }

app/Events/Auth/ProvidedAuthenticationToken.php

@@ -7,7 +7,5 @@ use App\Events\Event;
 
 class ProvidedAuthenticationToken extends Event
 {
-    public function __construct(public User $user, public bool $recovery = false)
-    {
-    }
+    public function __construct(public User $user, public bool $recovery = false) {}
 }

app/Events/Event.php

@@ -2,6 +2,4 @@
 
 namespace App\Events;
 
-abstract class Event
-{
-}
+abstract class Event {}

app/Events/Server/Installed.php

@@ -13,7 +13,5 @@ class Installed extends Event
     /**
      * Create a new event instance.
      */
-    public function __construct(public Server $server)
-    {
-    }
+    public function __construct(public Server $server, public bool $successful, public bool $initialInstall) {}
 }

app/Events/Server/SubUserAdded.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Events\Server;
+
+use App\Events\Event;
+use App\Models\Subuser;
+use Illuminate\Queue\SerializesModels;
+
+class SubUserAdded extends Event
+{
+    use SerializesModels;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(public Subuser $subuser) {}
+}

app/Events/Server/SubUserRemoved.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Events\Server;
+
+use App\Events\Event;
+use App\Models\Server;
+use App\Models\User;
+use Illuminate\Queue\SerializesModels;
+
+class SubUserRemoved extends Event
+{
+    use SerializesModels;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(public Server $server, public User $user) {}
+}

app/Exceptions/AccountNotFoundException.php

@@ -1,7 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-class AccountNotFoundException extends \Exception
-{
-}

app/Exceptions/AutoDeploymentException.php

@@ -1,7 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-class AutoDeploymentException extends \Exception
-{
-}

app/Exceptions/DisplayException.php

@@ -10,7 +10,6 @@ use Illuminate\Http\Request;
 use Psr\Log\LoggerInterface;
 use Illuminate\Http\Response;
 use Illuminate\Container\Container;
-use Prologue\Alerts\AlertsMessageBag;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 
 class DisplayException extends PanelException implements HttpExceptionInterface
@@ -67,9 +66,6 @@ class DisplayException extends PanelException implements HttpExceptionInterface
             return response()->json(Handler::toArray($this), $this->getStatusCode(), $this->getHeaders());
         }
 
-        // @phpstan-ignore-next-line
-        app(AlertsMessageBag::class)->danger($this->getMessage())->flash();
-
         return redirect()->back()->withInput();
     }
 

app/Exceptions/Http/Base/InvalidPasswordProvidedException.php

@@ -4,6 +4,4 @@ namespace App\Exceptions\Http\Base;
 
 use App\Exceptions\DisplayException;
 
-class InvalidPasswordProvidedException extends DisplayException
-{
-}
+class InvalidPasswordProvidedException extends DisplayException {}

app/Exceptions/Http/Connection/DaemonConnectionException.php

@@ -2,14 +2,11 @@
 
 namespace App\Exceptions\Http\Connection;
 
+use Exception;
 use Illuminate\Http\Response;
-use GuzzleHttp\Exception\GuzzleException;
 use App\Exceptions\DisplayException;
 use Illuminate\Support\Facades\Context;
 
-/**
- * @method \GuzzleHttp\Exception\GuzzleException getPrevious()
- */
 class DaemonConnectionException extends DisplayException
 {
     private int $statusCode = Response::HTTP_GATEWAY_TIMEOUT;
@@ -25,7 +22,7 @@ class DaemonConnectionException extends DisplayException
     /**
      * Throw a displayable exception caused by a daemon connection error.
      */
-    public function __construct(GuzzleException $previous, bool $useStatusCode = true)
+    public function __construct(?Exception $previous, bool $useStatusCode = true)
     {
         /** @var \GuzzleHttp\Psr7\Response|null $response */
         $response = method_exists($previous, 'getResponse') ? $previous->getResponse() : null;

app/Exceptions/Http/Server/FileTypeNotEditableException.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Exceptions\Http\Server;
-
-use App\Exceptions\DisplayException;
-
-class FileTypeNotEditableException extends DisplayException
-{
-}

app/Exceptions/PanelException.php

@@ -2,6 +2,4 @@
 
 namespace App\Exceptions;
 
-class PanelException extends \Exception
-{
-}
+class PanelException extends \Exception {}

app/Exceptions/Repository/Daemon/InvalidPowerSignalException.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Exceptions\Repository\Daemon;
-
-use App\Exceptions\Repository\RepositoryException;
-
-class InvalidPowerSignalException extends RepositoryException
-{
-}

app/Exceptions/Repository/DuplicateDatabaseNameException.php

@@ -4,6 +4,4 @@ namespace App\Exceptions\Repository;
 
 use App\Exceptions\DisplayException;
 
-class DuplicateDatabaseNameException extends DisplayException
-{
-}
+class DuplicateDatabaseNameException extends DisplayException {}

app/Exceptions/Repository/RepositoryException.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Exceptions\Repository;
-
-use App\Exceptions\PanelException;
-
-class RepositoryException extends PanelException
-{
-}

app/Exceptions/Service/Allocation/AllocationDoesNotBelongToServerException.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Exceptions\Service\Allocation;
-
-use App\Exceptions\PanelException;
-
-class AllocationDoesNotBelongToServerException extends PanelException
-{
-}

app/Exceptions/Service/Allocation/ServerUsingAllocationException.php

@@ -4,6 +4,4 @@ namespace App\Exceptions\Service\Allocation;
 
 use App\Exceptions\DisplayException;
 
-class ServerUsingAllocationException extends DisplayException
-{
-}
+class ServerUsingAllocationException extends DisplayException {}

app/Exceptions/Service/Deployment/NoViableAllocationException.php

@@ -4,6 +4,4 @@ namespace App\Exceptions\Service\Deployment;
 
 use App\Exceptions\DisplayException;
 
-class NoViableAllocationException extends DisplayException
-{
-}
+class NoViableAllocationException extends DisplayException {}

app/Exceptions/Service/Egg/BadJsonFormatException.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Exceptions\Service\Egg;
-
-use App\Exceptions\DisplayException;
-
-class BadJsonFormatException extends DisplayException
-{
-}

app/Exceptions/Service/Egg/HasChildrenException.php

@@ -4,6 +4,4 @@ namespace App\Exceptions\Service\Egg;
 
 use App\Exceptions\DisplayException;
 
-class HasChildrenException extends DisplayException
-{
-}
+class HasChildrenException extends DisplayException {}

app/Exceptions/Service/Egg/NoParentConfigurationFoundException.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Exceptions\Service\Egg;
-
-use App\Exceptions\DisplayException;
-
-class NoParentConfigurationFoundException extends DisplayException
-{
-}

app/Exceptions/Service/Egg/Variable/BadValidationRuleException.php

@@ -4,6 +4,4 @@ namespace App\Exceptions\Service\Egg\Variable;
 
 use App\Exceptions\DisplayException;
 
-class BadValidationRuleException extends DisplayException
-{
-}
+class BadValidationRuleException extends DisplayException {}

app/Exceptions/Service/Egg/Variable/ReservedVariableNameException.php

@@ -4,6 +4,4 @@ namespace App\Exceptions\Service\Egg\Variable;
 
 use App\Exceptions\DisplayException;
 
-class ReservedVariableNameException extends DisplayException
-{
-}
+class ReservedVariableNameException extends DisplayException {}

app/Exceptions/Service/InvalidFileUploadException.php

@@ -4,6 +4,4 @@ namespace App\Exceptions\Service;
 
 use App\Exceptions\DisplayException;
 
-class InvalidFileUploadException extends DisplayException
-{
-}
+class InvalidFileUploadException extends DisplayException {}

app/Exceptions/Service/Node/ConfigurationNotPersistedException.php

@@ -4,6 +4,4 @@ namespace App\Exceptions\Service\Node;
 
 use App\Exceptions\DisplayException;
 
-class ConfigurationNotPersistedException extends DisplayException
-{
-}
+class ConfigurationNotPersistedException extends DisplayException {}

app/Exceptions/Service/Schedule/Task/TaskIntervalTooLongException.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Exceptions\Service\Schedule\Task;
-
-use App\Exceptions\DisplayException;
-
-class TaskIntervalTooLongException extends DisplayException
-{
-}

app/Exceptions/Service/Server/RequiredVariableMissingException.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Exceptions\Service\Server;
-
-use App\Exceptions\PanelException;
-
-class RequiredVariableMissingException extends PanelException
-{
-}

app/Exceptions/Service/Subuser/ServerSubuserExistsException.php

@@ -4,6 +4,4 @@ namespace App\Exceptions\Service\Subuser;
 
 use App\Exceptions\DisplayException;
 
-class ServerSubuserExistsException extends DisplayException
-{
-}
+class ServerSubuserExistsException extends DisplayException {}

app/Exceptions/Service/Subuser/UserIsServerOwnerException.php

@@ -4,6 +4,4 @@ namespace App\Exceptions\Service\Subuser;
 
 use App\Exceptions\DisplayException;
 
-class UserIsServerOwnerException extends DisplayException
-{
-}
+class UserIsServerOwnerException extends DisplayException {}

app/Exceptions/Transformer/InvalidTransformerLevelException.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Exceptions\Transformer;
-
-use App\Exceptions\PanelException;
-
-class InvalidTransformerLevelException extends PanelException
-{
-}

app/Extensions/Backups/BackupManager.php

@@ -27,9 +27,7 @@ class BackupManager
     /**
      * BackupManager constructor.
      */
-    public function __construct(protected Application $app)
-    {
-    }
+    public function __construct(protected Application $app) {}
 
     /**
      * Returns a backup adapter instance.

app/Extensions/Facades/Theme.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Extensions\Facades;
-
-use Illuminate\Support\Facades\Facade;
-
-class Theme extends Facade
-{
-    protected static function getFacadeAccessor(): string
-    {
-        return 'extensions.themes';
-    }
-}

app/Extensions/Themes/Theme.php

@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Extensions\Themes;
-
-class Theme
-{
-    public function js(string $path): string
-    {
-        return sprintf('<script src="%s"></script>' . PHP_EOL, $this->getUrl($path));
-    }
-
-    public function css(string $path): string
-    {
-        return sprintf('<link media="all" type="text/css" rel="stylesheet" href="%s"/>' . PHP_EOL, $this->getUrl($path));
-    }
-
-    protected function getUrl(string $path): string
-    {
-        return '/themes/panel/' . ltrim($path, '/');
-    }
-}

app/Facades/LogBatch.php

@@ -1,14 +0,0 @@
-<?php
-
-namespace App\Facades;
-
-use Illuminate\Support\Facades\Facade;
-use App\Services\Activity\ActivityLogBatchService;
-
-class LogBatch extends Facade
-{
-    protected static function getFacadeAccessor(): string
-    {
-        return ActivityLogBatchService::class;
-    }
-}

app/Filament/Admin/Pages/Dashboard.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace App\Filament\Pages;
+namespace App\Filament\Admin\Pages;
 
-use App\Filament\Resources\NodeResource\Pages\ListNodes;
+use App\Filament\Admin\Resources\NodeResource\Pages\CreateNode;
+use App\Filament\Admin\Resources\NodeResource\Pages\ListNodes;
 use App\Models\Egg;
 use App\Models\Node;
 use App\Models\Server;
@@ -39,8 +40,8 @@ class Dashboard extends Page
     {
         return [
             'inDevelopment' => config('app.version') === 'canary',
-            'version' => $this->softwareVersionService->versionData()['version'],
-            'latestVersion' => $this->softwareVersionService->getPanel(),
+            'version' => $this->softwareVersionService->currentPanelVersion(),
+            'latestVersion' => $this->softwareVersionService->latestPanelVersion(),
             'isLatest' => $this->softwareVersionService->isLatestPanel(),
             'eggsCount' => Egg::query()->count(),
             'nodesList' => ListNodes::getUrl(),
@@ -65,13 +66,13 @@ class Dashboard extends Page
                 CreateAction::make()
                     ->label(trans('dashboard/index.sections.intro-first-node.button_label'))
                     ->icon('tabler-server-2')
-                    ->url(route('filament.admin.resources.nodes.create')),
+                    ->url(CreateNode::getUrl()),
             ],
             'supportActions' => [
                 CreateAction::make()
                     ->label(trans('dashboard/index.sections.intro-support.button_donate'))
                     ->icon('tabler-cash')
-                    ->url($this->softwareVersionService->getDonations(), true)
+                    ->url('https://pelican.dev/donate', true)
                     ->color('success'),
             ],
             'helpActions' => [

app/Filament/Admin/Pages/Health.php

@@ -0,0 +1,120 @@
+<?php
+
+namespace App\Filament\Admin\Pages;
+
+use Carbon\Carbon;
+use Filament\Actions\Action;
+use Filament\Notifications\Notification;
+use Filament\Pages\Page;
+use Illuminate\Support\Facades\Artisan;
+use Spatie\Health\Commands\RunHealthChecksCommand;
+use Spatie\Health\ResultStores\ResultStore;
+
+class Health extends Page
+{
+    protected static ?string $navigationIcon = 'tabler-heart';
+
+    protected static ?string $navigationGroup = 'Advanced';
+
+    protected static string $view = 'filament.pages.health';
+
+    // @phpstan-ignore-next-line
+    protected $listeners = [
+        'refresh-component' => '$refresh',
+    ];
+
+    protected function getActions(): array
+    {
+        return [
+            Action::make('refresh')
+                ->button()
+                ->action('refresh'),
+        ];
+    }
+
+    protected function getViewData(): array
+    {
+        // @phpstan-ignore-next-line
+        $checkResults = app(ResultStore::class)->latestResults();
+
+        if ($checkResults === null) {
+            Artisan::call(RunHealthChecksCommand::class);
+
+            $this->dispatch('refresh-component');
+        }
+
+        return [
+            'lastRanAt' => new Carbon($checkResults?->finishedAt),
+            'checkResults' => $checkResults,
+        ];
+    }
+
+    public function refresh(): void
+    {
+        Artisan::call(RunHealthChecksCommand::class);
+
+        $this->dispatch('refresh-component');
+
+        Notification::make()
+            ->title('Health check results refreshed')
+            ->success()
+            ->send();
+    }
+
+    public static function getNavigationBadge(): ?string
+    {
+        // @phpstan-ignore-next-line
+        $results = app(ResultStore::class)->latestResults();
+
+        if ($results === null) {
+            return null;
+        }
+
+        $results = json_decode($results->toJson(), true);
+
+        $failed = array_reduce($results['checkResults'], function ($numFailed, $result) {
+            return $numFailed + ($result['status'] === 'failed' ? 1 : 0);
+        }, 0);
+
+        return $failed === 0 ? null : (string) $failed;
+    }
+
+    public static function getNavigationBadgeColor(): string
+    {
+        return self::getNavigationBadge() > null ? 'danger' : '';
+    }
+
+    public static function getNavigationBadgeTooltip(): ?string
+    {
+        // @phpstan-ignore-next-line
+        $results = app(ResultStore::class)->latestResults();
+
+        if ($results === null) {
+            return null;
+        }
+
+        $results = json_decode($results->toJson(), true);
+
+        $failedNames = array_reduce($results['checkResults'], function ($carry, $result) {
+            if ($result['status'] === 'failed') {
+                $carry[] = $result['name'];
+            }
+
+            return $carry;
+        }, []);
+
+        return 'Failed: ' . implode(', ', $failedNames);
+    }
+
+    public static function getNavigationIcon(): string
+    {
+        // @phpstan-ignore-next-line
+        $results = app(ResultStore::class)->latestResults();
+
+        if ($results === null) {
+            return 'tabler-heart-question';
+        }
+
+        return $results->containsFailingCheck() ? 'tabler-heart-exclamation' : 'tabler-heart-check';
+    }
+}

app/Filament/Admin/Pages/Settings.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Pages;
+namespace App\Filament\Admin\Pages;
 
 use App\Models\Backup;
 use App\Notifications\MailTested;
@@ -8,7 +8,9 @@ use App\Traits\EnvironmentWriterTrait;
 use Exception;
 use Filament\Actions\Action;
 use Filament\Forms\Components\Actions\Action as FormAction;
+use Filament\Forms\Components\Placeholder;
 use Filament\Forms\Components\Section;
+use Filament\Forms\Components\Select;
 use Filament\Forms\Components\Tabs;
 use Filament\Forms\Components\Tabs\Tab;
 use Filament\Forms\Components\TagsInput;
@@ -21,11 +23,14 @@ use Filament\Forms\Form;
 use Filament\Forms\Get;
 use Filament\Forms\Set;
 use Filament\Notifications\Notification;
-use Filament\Pages\Concerns\HasUnsavedDataChangesAlert;
 use Filament\Pages\Concerns\InteractsWithHeaderActions;
 use Filament\Pages\Page;
+use Filament\Support\Enums\MaxWidth;
+use Illuminate\Http\Client\Factory;
 use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Notification as MailNotification;
+use Illuminate\Support\HtmlString;
 
 /**
  * @property Form $form
@@ -33,7 +38,6 @@ use Illuminate\Support\Facades\Notification as MailNotification;
 class Settings extends Page implements HasForms
 {
     use EnvironmentWriterTrait;
-    use HasUnsavedDataChangesAlert;
     use InteractsWithForms;
     use InteractsWithHeaderActions;
 
@@ -67,10 +71,11 @@ class Settings extends Page implements HasForms
                         ->label('General')
                         ->icon('tabler-home')
                         ->schema($this->generalSettings()),
-                    Tab::make('recaptcha')
-                        ->label('reCAPTCHA')
+                    Tab::make('captcha')
+                        ->label('Captcha')
                         ->icon('tabler-shield')
-                        ->schema($this->recaptchaSettings()),
+                        ->schema($this->captchaSettings())
+                        ->columns(3),
                     Tab::make('mail')
                         ->label('Mail')
                         ->icon('tabler-mail')
@@ -79,6 +84,10 @@ class Settings extends Page implements HasForms
                         ->label('Backup')
                         ->icon('tabler-box')
                         ->schema($this->backupSettings()),
+                    Tab::make('OAuth')
+                        ->label('OAuth')
+                        ->icon('tabler-brand-oauth')
+                        ->schema($this->oauthSettings()),
                     Tab::make('misc')
                         ->label('Misc')
                         ->icon('tabler-tool')
@@ -146,7 +155,7 @@ class Settings extends Page implements HasForms
                 ->separator()
                 ->splitKeys(['Tab', ' '])
                 ->placeholder('New IP or IP Range')
-                ->default(env('TRUSTED_PROXIES', config('trustedproxy.proxies')))
+                ->default(env('TRUSTED_PROXIES', implode(',', config('trustedproxy.proxies'))))
                 ->hintActions([
                     FormAction::make('clear')
                         ->label('Clear')
@@ -159,56 +168,77 @@ class Settings extends Page implements HasForms
                         ->label('Set to Cloudflare IPs')
                         ->icon('tabler-brand-cloudflare')
                         ->authorize(fn () => auth()->user()->can('update settings'))
-                        ->action(fn (Set $set) => $set('TRUSTED_PROXIES', [
-                            '173.245.48.0/20',
-                            '103.21.244.0/22',
-                            '103.22.200.0/22',
-                            '103.31.4.0/22',
-                            '141.101.64.0/18',
-                            '108.162.192.0/18',
-                            '190.93.240.0/20',
-                            '188.114.96.0/20',
-                            '197.234.240.0/22',
-                            '198.41.128.0/17',
-                            '162.158.0.0/15',
-                            '104.16.0.0/13',
-                            '104.24.0.0/14',
-                            '172.64.0.0/13',
-                            '131.0.72.0/22',
-                        ])),
+                        ->action(function (Factory $client, Set $set) {
+                            $ips = collect();
+
+                            try {
+                                $response = $client
+                                    ->timeout(3)
+                                    ->connectTimeout(3)
+                                    ->get('https://api.cloudflare.com/client/v4/ips');
+
+                                if ($response->getStatusCode() === 200) {
+                                    $result = $response->json('result');
+                                    foreach (['ipv4_cidrs', 'ipv6_cidrs'] as $value) {
+                                        $ips->push(...data_get($result, $value));
+                                    }
+                                    $ips->unique();
+                                }
+                            } catch (Exception) {
+                            }
+
+                            $set('TRUSTED_PROXIES', $ips->values()->all());
+                        }),
                 ]),
+            Select::make('FILAMENT_WIDTH')
+                ->label('Display Width')
+                ->native(false)
+                ->options(MaxWidth::class)
+                ->default(env('FILAMENT_WIDTH', config('panel.filament.display-width'))),
         ];
     }
 
-    private function recaptchaSettings(): array
+    private function captchaSettings(): array
     {
         return [
-            Toggle::make('RECAPTCHA_ENABLED')
-                ->label('Enable reCAPTCHA?')
+            Toggle::make('TURNSTILE_ENABLED')
+                ->label('Enable Turnstile Captcha?')
                 ->inline(false)
+                ->columnSpan(1)
                 ->onIcon('tabler-check')
                 ->offIcon('tabler-x')
                 ->onColor('success')
                 ->offColor('danger')
                 ->live()
                 ->formatStateUsing(fn ($state): bool => (bool) $state)
-                ->afterStateUpdated(fn ($state, Set $set) => $set('RECAPTCHA_ENABLED', (bool) $state))
-                ->default(env('RECAPTCHA_ENABLED', config('recaptcha.enabled'))),
-            TextInput::make('RECAPTCHA_DOMAIN')
-                ->label('Domain')
+                ->afterStateUpdated(fn ($state, Set $set) => $set('TURNSTILE_ENABLED', (bool) $state))
+                ->default(env('TURNSTILE_ENABLED', config('turnstile.turnstile_enabled'))),
+            Placeholder::make('info')
+                ->columnSpan(2)
+                ->content(new HtmlString('<p>You can generate the keys on your <u><a href="https://developers.cloudflare.com/turnstile/get-started/#get-a-sitekey-and-secret-key" target="_blank">Cloudflare Dashboard</a></u>. A Cloudflare account is required.</p>')),
+            TextInput::make('TURNSTILE_SITE_KEY')
+                ->label('Site Key')
                 ->required()
-                ->visible(fn (Get $get) => $get('RECAPTCHA_ENABLED'))
-                ->default(env('RECAPTCHA_DOMAIN', config('recaptcha.domain'))),
-            TextInput::make('RECAPTCHA_WEBSITE_KEY')
-                ->label('Website Key')
-                ->required()
-                ->visible(fn (Get $get) => $get('RECAPTCHA_ENABLED'))
-                ->default(env('RECAPTCHA_WEBSITE_KEY', config('recaptcha.website_key'))),
-            TextInput::make('RECAPTCHA_SECRET_KEY')
+                ->visible(fn (Get $get) => $get('TURNSTILE_ENABLED'))
+                ->default(env('TURNSTILE_SITE_KEY', config('turnstile.turnstile_site_key')))
+                ->placeholder('1x00000000000000000000AA'),
+            TextInput::make('TURNSTILE_SECRET_KEY')
                 ->label('Secret Key')
                 ->required()
-                ->visible(fn (Get $get) => $get('RECAPTCHA_ENABLED'))
-                ->default(env('RECAPTCHA_SECRET_KEY', config('recaptcha.secret_key'))),
+                ->visible(fn (Get $get) => $get('TURNSTILE_ENABLED'))
+                ->default(env('TURNSTILE_SECRET_KEY', config('turnstile.secret_key')))
+                ->placeholder('1x0000000000000000000000000000000AA'),
+            Toggle::make('TURNSTILE_VERIFY_DOMAIN')
+                ->label('Verify domain?')
+                ->inline(false)
+                ->onIcon('tabler-check')
+                ->offIcon('tabler-x')
+                ->onColor('success')
+                ->offColor('danger')
+                ->visible(fn (Get $get) => $get('TURNSTILE_ENABLED'))
+                ->formatStateUsing(fn ($state): bool => (bool) $state)
+                ->afterStateUpdated(fn ($state, Set $set) => $set('TURNSTILE_VERIFY_DOMAIN', (bool) $state))
+                ->default(env('TURNSTILE_VERIFY_DOMAIN', config('turnstile.turnstile_verify_domain'))),
         ];
     }
 
@@ -220,12 +250,12 @@ class Settings extends Page implements HasForms
                 ->columnSpanFull()
                 ->inline()
                 ->options([
-                    'log' => 'Print mails to Log',
+                    'log' => '/storage/logs Directory',
                     'smtp' => 'SMTP Server',
-                    'sendmail' => 'sendmail Binary',
                     'mailgun' => 'Mailgun',
                     'mandrill' => 'Mandrill',
                     'postmark' => 'Postmark',
+                    'sendmail' => 'sendmail (PHP)',
                 ])
                 ->live()
                 ->default(env('MAIL_MAILER', config('mail.default')))
@@ -386,6 +416,74 @@ class Settings extends Page implements HasForms
         ];
     }
 
+    private function oauthSettings(): array
+    {
+        $oauthProviders = Config::get('auth.oauth');
+
+        $formFields = [];
+
+        foreach ($oauthProviders as $providerName => $providerConfig) {
+            $providerEnvPrefix = strtoupper($providerName);
+
+            $fields = [
+                Toggle::make("OAUTH_{$providerEnvPrefix}_ENABLED")
+                    ->onColor('success')
+                    ->offColor('danger')
+                    ->onIcon('tabler-check')
+                    ->offIcon('tabler-x')
+                    ->live()
+                    ->columnSpan(1)
+                    ->label('Enabled')
+                    ->default(env("OAUTH_{$providerEnvPrefix}_ENABLED", false)),
+            ];
+
+            if (array_key_exists('client_id', $providerConfig['service'] ?? [])) {
+                $fields[] = TextInput::make("OAUTH_{$providerEnvPrefix}_CLIENT_ID")
+                    ->label('Client ID')
+                    ->columnSpan(2)
+                    ->required()
+                    ->password()
+                    ->revealable()
+                    ->autocomplete(false)
+                    ->hidden(fn (Get $get) => !$get("OAUTH_{$providerEnvPrefix}_ENABLED"))
+                    ->default(env("OAUTH_{$providerEnvPrefix}_CLIENT_ID", $providerConfig['service']['client_id'] ?? ''))
+                    ->placeholder('Client ID');
+            }
+
+            if (array_key_exists('client_secret', $providerConfig['service'] ?? [])) {
+                $fields[] = TextInput::make("OAUTH_{$providerEnvPrefix}_CLIENT_SECRET")
+                    ->label('Client Secret')
+                    ->columnSpan(2)
+                    ->required()
+                    ->password()
+                    ->revealable()
+                    ->autocomplete(false)
+                    ->hidden(fn (Get $get) => !$get("OAUTH_{$providerEnvPrefix}_ENABLED"))
+                    ->default(env("OAUTH_{$providerEnvPrefix}_CLIENT_SECRET", $providerConfig['service']['client_secret'] ?? ''))
+                    ->placeholder('Client Secret');
+            }
+
+            if (array_key_exists('base_url', $providerConfig['service'] ?? [])) {
+                $fields[] = TextInput::make("OAUTH_{$providerEnvPrefix}_BASE_URL")
+                    ->label('Base URL')
+                    ->columnSpanFull()
+                    ->autocomplete(false)
+                    ->hidden(fn (Get $get) => !$get("OAUTH_{$providerEnvPrefix}_ENABLED"))
+                    ->default(env("OAUTH_{$providerEnvPrefix}_BASE_URL", ''))
+                    ->placeholder('Base URL');
+            }
+
+            $formFields[] = Section::make(ucfirst($providerName))
+                ->columns(5)
+                ->icon($providerConfig['icon'] ?? 'tabler-brand-oauth')
+                ->collapsed(fn () => !env("OAUTH_{$providerEnvPrefix}_ENABLED", false))
+                ->collapsible()
+                ->schema($fields);
+        }
+
+        return $formFields;
+    }
+
     private function miscSettings(): array
     {
         return [
@@ -540,7 +638,21 @@ class Settings extends Page implements HasForms
                         ->afterStateUpdated(fn ($state, Set $set) => $set('PANEL_EDITABLE_SERVER_DESCRIPTIONS', (bool) $state))
                         ->default(env('PANEL_EDITABLE_SERVER_DESCRIPTIONS', config('panel.editable_server_descriptions'))),
                 ]),
-
+            Section::make('Webhook')
+                ->description('Configure how often old webhook logs should be pruned.')
+                ->columns()
+                ->collapsible()
+                ->collapsed()
+                ->schema([
+                    TextInput::make('APP_WEBHOOK_PRUNE_DAYS')
+                        ->label('Prune age')
+                        ->required()
+                        ->numeric()
+                        ->minValue(1)
+                        ->maxValue(365)
+                        ->suffix('Days')
+                        ->default(env('APP_WEBHOOK_PRUNE_DAYS', config('panel.webhook.prune_days'))),
+                ]),
         ];
     }
 
@@ -549,11 +661,6 @@ class Settings extends Page implements HasForms
         return 'data';
     }
 
-    protected function hasUnsavedDataChangesAlert(): bool
-    {
-        return true;
-    }
-
     public function save(): void
     {
         try {
@@ -567,8 +674,6 @@ class Settings extends Page implements HasForms
             Artisan::call('config:clear');
             Artisan::call('queue:restart');
 
-            $this->rememberData();
-
             $this->redirect($this->getUrl());
 
             Notification::make()

app/Filament/Admin/Resources/ApiKeyResource.php

@@ -1,17 +1,20 @@
 <?php
 
-namespace App\Filament\Resources;
+namespace App\Filament\Admin\Resources;
 
-use App\Filament\Resources\ApiKeyResource\Pages;
+use App\Filament\Admin\Resources\ApiKeyResource\Pages;
 use App\Models\ApiKey;
 use Filament\Resources\Resource;
-use Illuminate\Database\Eloquent\Model;
 
 class ApiKeyResource extends Resource
 {
     protected static ?string $model = ApiKey::class;
 
-    protected static ?string $label = 'API Key';
+    protected static ?string $modelLabel = 'Application API Key';
+
+    protected static ?string $pluralModelLabel = 'Application API Keys';
+
+    protected static ?string $navigationLabel = 'API Keys';
 
     protected static ?string $navigationIcon = 'tabler-key';
 
@@ -22,11 +25,6 @@ class ApiKeyResource extends Resource
         return static::getModel()::where('key_type', ApiKey::TYPE_APPLICATION)->count() ?: null;
     }
 
-    public static function canEdit(Model $record): bool
-    {
-        return false;
-    }
-
     public static function getPages(): array
     {
         return [

app/Filament/Admin/Resources/ApiKeyResource/Pages/CreateApiKey.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\ApiKeyResource\Pages;
+namespace App\Filament\Admin\Resources\ApiKeyResource\Pages;
 
-use App\Filament\Resources\ApiKeyResource;
+use App\Filament\Admin\Resources\ApiKeyResource;
 use App\Models\ApiKey;
 use Filament\Forms\Components\Fieldset;
 use Filament\Forms\Components\Hidden;
@@ -11,12 +11,25 @@ use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\ToggleButtons;
 use Filament\Forms\Form;
 use Filament\Resources\Pages\CreateRecord;
+use Illuminate\Database\Eloquent\Model;
 
 class CreateApiKey extends CreateRecord
 {
     protected static string $resource = ApiKeyResource::class;
 
-    protected ?string $heading = 'Create Application API Key';
+    protected static bool $canCreateAnother = false;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            $this->getCreateFormAction()->formId('form'),
+        ];
+    }
+
+    protected function getFormActions(): array
+    {
+        return [];
+    }
 
     public function form(Form $form): Form
     {
@@ -41,7 +54,7 @@ class CreateApiKey extends CreateRecord
                         'md' => 2,
                     ])
                     ->schema(
-                        collect(ApiKey::RESOURCES)->map(fn ($resource) => ToggleButtons::make("r_$resource")
+                        collect(ApiKey::getPermissionList())->map(fn ($resource) => ToggleButtons::make('permissions_' . $resource)
                             ->label(str($resource)->replace('_', ' ')->title())->inline()
                             ->options([
                                 0 => 'None',
@@ -87,4 +100,20 @@ class CreateApiKey extends CreateRecord
                     ->columnSpanFull(),
             ]);
     }
+
+    protected function handleRecordCreation(array $data): Model
+    {
+        $permissions = [];
+
+        foreach (ApiKey::getPermissionList() as $permission) {
+            if (isset($data['permissions_' . $permission])) {
+                $permissions[$permission] = intval($data['permissions_' . $permission]);
+                unset($data['permissions_' . $permission]);
+            }
+        }
+
+        $data['permissions'] = $permissions;
+
+        return parent::handleRecordCreation($data);
+    }
 }

app/Filament/Admin/Resources/ApiKeyResource/Pages/ListApiKeys.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace App\Filament\Resources\ApiKeyResource\Pages;
+namespace App\Filament\Admin\Resources\ApiKeyResource\Pages;
 
-use App\Filament\Resources\ApiKeyResource;
+use App\Filament\Admin\Resources\ApiKeyResource;
+use App\Filament\Components\Tables\Columns\DateTimeColumn;
 use App\Models\ApiKey;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
@@ -35,15 +36,13 @@ class ListApiKeys extends ListRecords
                     ->hidden()
                     ->searchable(),
 
-                TextColumn::make('last_used_at')
+                DateTimeColumn::make('last_used_at')
                     ->label('Last Used')
                     ->placeholder('Not Used')
-                    ->dateTime()
                     ->sortable(),
 
-                TextColumn::make('created_at')
+                DateTimeColumn::make('created_at')
                     ->label('Created')
-                    ->dateTime()
                     ->sortable(),
 
                 TextColumn::make('user.username')

app/Filament/Admin/Resources/DatabaseHostResource.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources;
+namespace App\Filament\Admin\Resources;
 
-use App\Filament\Resources\DatabaseHostResource\Pages;
+use App\Filament\Admin\Resources\DatabaseHostResource\Pages;
 use App\Models\DatabaseHost;
 use Filament\Resources\Resource;
 
@@ -10,12 +10,12 @@ class DatabaseHostResource extends Resource
 {
     protected static ?string $model = DatabaseHost::class;
 
-    protected static ?string $label = 'Database Host';
-
     protected static ?string $navigationIcon = 'tabler-database';
 
     protected static ?string $navigationGroup = 'Advanced';
 
+    protected static ?string $recordTitleAttribute = 'name';
+
     public static function getNavigationBadge(): ?string
     {
         return static::getModel()::count() ?: null;

app/Filament/Admin/Resources/DatabaseHostResource/Pages/CreateDatabaseHost.php

@@ -1,11 +1,9 @@
 <?php
 
-namespace App\Filament\Resources\DatabaseHostResource\Pages;
+namespace App\Filament\Admin\Resources\DatabaseHostResource\Pages;
 
-use App\Filament\Resources\DatabaseHostResource;
+use App\Filament\Admin\Resources\DatabaseHostResource;
 use App\Services\Databases\Hosts\HostCreationService;
-use Closure;
-use Exception;
 use Filament\Forms;
 use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;
@@ -13,20 +11,17 @@ use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
 use Filament\Notifications\Notification;
 use Filament\Resources\Pages\CreateRecord;
+use Filament\Support\Exceptions\Halt;
 use Illuminate\Database\Eloquent\Model;
 use PDOException;
 
 class CreateDatabaseHost extends CreateRecord
 {
-    private HostCreationService $service;
-
     protected static string $resource = DatabaseHostResource::class;
 
-    protected ?string $heading = 'Database Hosts';
-
     protected static bool $canCreateAnother = false;
 
-    protected ?string $subheading = '(database servers that can have individual databases)';
+    private HostCreationService $service;
 
     public function boot(HostCreationService $service): void
     {
@@ -79,12 +74,13 @@ class CreateDatabaseHost extends CreateRecord
                             ->revealable()
                             ->maxLength(255)
                             ->required(),
-                        Select::make('node_id')
+                        Select::make('node_ids')
+                            ->multiple()
                             ->searchable()
                             ->preload()
                             ->helperText('This setting only defaults to this database host when adding a database to a server on the selected node.')
-                            ->label('Linked Node')
-                            ->relationship('node', 'name'),
+                            ->label('Linked Nodes')
+                            ->relationship('nodes', 'name'),
                     ]),
             ]);
     }
@@ -103,21 +99,18 @@ class CreateDatabaseHost extends CreateRecord
 
     protected function handleRecordCreation(array $data): Model
     {
-        return $this->service->handle($data);
-    }
-
-    public function exception(Exception $e, Closure $stopPropagation): void
-    {
-        if ($e instanceof PDOException) {
+        try {
+            return $this->service->handle($data);
+        } catch (PDOException $exception) {
             Notification::make()
                 ->title('Error connecting to database host')
-                ->body($e->getMessage())
+                ->body($exception->getMessage())
                 ->color('danger')
                 ->icon('tabler-database')
                 ->danger()
                 ->send();
 
-            $stopPropagation();
+            throw new Halt();
         }
     }
 }

app/Filament/Admin/Resources/DatabaseHostResource/Pages/EditDatabaseHost.php

@@ -1,13 +1,11 @@
 <?php
 
-namespace App\Filament\Resources\DatabaseHostResource\Pages;
+namespace App\Filament\Admin\Resources\DatabaseHostResource\Pages;
 
-use App\Filament\Resources\DatabaseHostResource;
-use App\Filament\Resources\DatabaseHostResource\RelationManagers\DatabasesRelationManager;
+use App\Filament\Admin\Resources\DatabaseHostResource;
+use App\Filament\Admin\Resources\DatabaseHostResource\RelationManagers\DatabasesRelationManager;
 use App\Models\DatabaseHost;
 use App\Services\Databases\Hosts\HostUpdateService;
-use Closure;
-use Exception;
 use Filament\Actions;
 use Filament\Forms;
 use Filament\Forms\Components\Section;
@@ -16,6 +14,7 @@ use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
 use Filament\Notifications\Notification;
 use Filament\Resources\Pages\EditRecord;
+use Filament\Support\Exceptions\Halt;
 use Illuminate\Database\Eloquent\Model;
 use PDOException;
 
@@ -74,12 +73,13 @@ class EditDatabaseHost extends EditRecord
                             ->password()
                             ->revealable()
                             ->maxLength(255),
-                        Select::make('node_id')
+                        Select::make('nodes')
+                            ->multiple()
                             ->searchable()
                             ->preload()
                             ->helperText('This setting only defaults to this database host when adding a database to a server on the selected node.')
-                            ->label('Linked Node')
-                            ->relationship('node', 'name'),
+                            ->label('Linked Nodes')
+                            ->relationship('nodes', 'name'),
                     ]),
             ]);
     }
@@ -101,9 +101,13 @@ class EditDatabaseHost extends EditRecord
 
     public function getRelationManagers(): array
     {
-        return [
-            DatabasesRelationManager::class,
-        ];
+        if (DatabasesRelationManager::canViewForRecord($this->getRecord(), static::class)) {
+            return [
+                DatabasesRelationManager::class,
+            ];
+        }
+
+        return [];
     }
 
     protected function handleRecordUpdate(Model $record, array $data): Model
@@ -112,21 +116,18 @@ class EditDatabaseHost extends EditRecord
             return $record;
         }
 
-        return $this->hostUpdateService->handle($record, $data);
-    }
-
-    public function exception(Exception $e, Closure $stopPropagation): void
-    {
-        if ($e instanceof PDOException) {
+        try {
+            return $this->hostUpdateService->handle($record, $data);
+        } catch (PDOException $exception) {
             Notification::make()
                 ->title('Error connecting to database host')
-                ->body($e->getMessage())
+                ->body($exception->getMessage())
                 ->color('danger')
                 ->icon('tabler-database')
                 ->danger()
                 ->send();
 
-            $stopPropagation();
+            throw new Halt();
         }
     }
 }

app/Filament/Admin/Resources/DatabaseHostResource/Pages/ListDatabaseHosts.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\DatabaseHostResource\Pages;
+namespace App\Filament\Admin\Resources\DatabaseHostResource\Pages;
 
-use App\Filament\Resources\DatabaseHostResource;
+use App\Filament\Admin\Resources\DatabaseHostResource;
 use App\Models\DatabaseHost;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
@@ -36,8 +36,9 @@ class ListDatabaseHosts extends ListRecords
                     ->counts('databases')
                     ->icon('tabler-database')
                     ->label('Databases'),
-                TextColumn::make('node.name')
+                TextColumn::make('nodes.name')
                     ->icon('tabler-server-2')
+                    ->badge()
                     ->placeholder('No Nodes')
                     ->sortable(),
             ])

app/Filament/Admin/Resources/DatabaseHostResource/RelationManagers/DatabasesRelationManager.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace App\Filament\Admin\Resources\DatabaseHostResource\RelationManagers;
+
+use App\Filament\Components\Forms\Actions\RotateDatabasePasswordAction;
+use App\Filament\Components\Tables\Columns\DateTimeColumn;
+use App\Models\Database;
+use Filament\Forms\Components\TextInput;
+use Filament\Forms\Form;
+use Filament\Resources\RelationManagers\RelationManager;
+use Filament\Tables\Actions\DeleteAction;
+use Filament\Tables\Actions\ViewAction;
+use Filament\Tables\Columns\TextColumn;
+use Filament\Tables\Table;
+
+class DatabasesRelationManager extends RelationManager
+{
+    protected static string $relationship = 'databases';
+
+    public function form(Form $form): Form
+    {
+        return $form
+            ->schema([
+                TextInput::make('database')
+                    ->columnSpanFull(),
+                TextInput::make('username'),
+                TextInput::make('password')
+                    ->password()
+                    ->revealable()
+                    ->hintAction(RotateDatabasePasswordAction::make())
+                    ->formatStateUsing(fn (Database $database) => $database->password),
+                TextInput::make('remote')
+                    ->label('Connections From')
+                    ->formatStateUsing(fn (Database $record) => $record->remote === '%' ? 'Anywhere ( % )' : $record->remote),
+                TextInput::make('max_connections')
+                    ->formatStateUsing(fn (Database $record) => $record->max_connections === 0 ? 'Unlimited' : $record->max_connections),
+                TextInput::make('jdbc')
+                    ->label('JDBC Connection String')
+                    ->columnSpanFull()
+                    ->password()
+                    ->revealable()
+                    ->formatStateUsing(fn (Database $database) => $database->jdbc),
+            ]);
+    }
+
+    public function table(Table $table): Table
+    {
+        return $table
+            ->recordTitleAttribute('servers')
+            ->columns([
+                TextColumn::make('database')
+                    ->icon('tabler-database'),
+                TextColumn::make('username')
+                    ->icon('tabler-user'),
+                TextColumn::make('remote')
+                    ->formatStateUsing(fn (Database $record) => $record->remote === '%' ? 'Anywhere ( % )' : $record->remote),
+                TextColumn::make('server.name')
+                    ->icon('tabler-brand-docker')
+                    ->url(fn (Database $database) => route('filament.admin.resources.servers.edit', ['record' => $database->server_id])),
+                TextColumn::make('max_connections')
+                    ->formatStateUsing(fn ($record) => $record->max_connections === 0 ? 'Unlimited' : $record->max_connections),
+                DateTimeColumn::make('created_at'),
+            ])
+            ->actions([
+                DeleteAction::make()
+                    ->authorize(fn (Database $database) => auth()->user()->can('delete database', $database)),
+                ViewAction::make()
+                    ->color('primary')
+                    ->hidden(fn () => !auth()->user()->can('viewList database')),
+            ]);
+    }
+}

app/Filament/Admin/Resources/EggResource.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources;
+namespace App\Filament\Admin\Resources;
 
-use App\Filament\Resources\EggResource\Pages;
+use App\Filament\Admin\Resources\EggResource\Pages;
 use App\Models\Egg;
 use Filament\Resources\Resource;
 
@@ -14,8 +14,6 @@ class EggResource extends Resource
 
     protected static ?string $recordTitleAttribute = 'name';
 
-    protected static ?string $recordRouteKeyName = 'id';
-
     public static function getNavigationBadge(): ?string
     {
         return static::getModel()::count() ?: null;

app/Filament/Admin/Resources/EggResource/Pages/CreateEgg.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Filament\Resources\EggResource\Pages;
+namespace App\Filament\Admin\Resources\EggResource\Pages;
 
 use AbdelhamidErrahmouni\FilamentMonacoEditor\MonacoEditor;
-use App\Filament\Resources\EggResource;
+use App\Filament\Admin\Resources\EggResource;
 use Filament\Forms\Components\Checkbox;
 use Filament\Forms\Components\Fieldset;
 use Filament\Forms\Components\Hidden;
@@ -28,6 +28,18 @@ class CreateEgg extends CreateRecord
 
     protected static bool $canCreateAnother = false;
 
+    protected function getHeaderActions(): array
+    {
+        return [
+            $this->getCreateFormAction()->formId('form'),
+        ];
+    }
+
+    protected function getFormActions(): array
+    {
+        return [];
+    }
+
     public function form(Form $form): Form
     {
         return $form

app/Filament/Admin/Resources/EggResource/Pages/EditEgg.php

@@ -1,21 +1,18 @@
 <?php
 
-namespace App\Filament\Resources\EggResource\Pages;
+namespace App\Filament\Admin\Resources\EggResource\Pages;
 
 use AbdelhamidErrahmouni\FilamentMonacoEditor\MonacoEditor;
-use App\Filament\Resources\EggResource;
-use App\Filament\Resources\EggResource\RelationManagers\ServersRelationManager;
+use App\Filament\Admin\Resources\EggResource;
+use App\Filament\Admin\Resources\EggResource\RelationManagers\ServersRelationManager;
+use App\Filament\Components\Actions\ExportEggAction;
+use App\Filament\Components\Actions\ImportEggAction;
 use App\Models\Egg;
-use App\Services\Eggs\Sharing\EggExporterService;
-use App\Services\Eggs\Sharing\EggImporterService;
-use Exception;
-use Filament\Actions;
+use Filament\Actions\DeleteAction;
 use Filament\Forms\Components\Checkbox;
 use Filament\Forms\Components\Fieldset;
-use Filament\Forms\Components\FileUpload;
 use Filament\Forms\Components\Hidden;
 use Filament\Forms\Components\KeyValue;
-use Filament\Forms\Components\Placeholder;
 use Filament\Forms\Components\Repeater;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\Tabs;
@@ -26,7 +23,6 @@ use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Toggle;
 use Filament\Forms\Form;
 use Filament\Forms\Set;
-use Filament\Notifications\Notification;
 use Filament\Resources\Pages\EditRecord;
 
 class EditEgg extends EditRecord
@@ -229,6 +225,7 @@ class EditEgg extends EditRecord
                                 ->default('ash'),
                             MonacoEditor::make('script_install')
                                 ->label('Install Script')
+                                ->placeholderText('')
                                 ->columnSpanFull()
                                 ->fontSize('16px')
                                 ->language('shell')
@@ -241,83 +238,11 @@ class EditEgg extends EditRecord
     protected function getHeaderActions(): array
     {
         return [
-            Actions\DeleteAction::make('deleteEgg')
+            DeleteAction::make()
                 ->disabled(fn (Egg $egg): bool => $egg->servers()->count() > 0)
                 ->label(fn (Egg $egg): string => $egg->servers()->count() <= 0 ? 'Delete' : 'In Use'),
-            Actions\Action::make('exportEgg')
-                ->label('Export')
-                ->color('primary')
-                ->action(fn (EggExporterService $service, Egg $egg) => response()->streamDownload(function () use ($service, $egg) {
-                    echo $service->handle($egg->id);
-                }, 'egg-' . $egg->getKebabName() . '.json'))
-                ->authorize(fn () => auth()->user()->can('export egg')),
-            Actions\Action::make('importEgg')
-                ->label('Import')
-                ->form([
-                    Placeholder::make('warning')
-                        ->label('This will overwrite the current egg to the one you upload.'),
-                    Tabs::make('Tabs')
-                        ->tabs([
-                            Tab::make('From File')
-                                ->icon('tabler-file-upload')
-                                ->schema([
-                                    FileUpload::make('egg')
-                                        ->label('Egg')
-                                        ->hint('eg. minecraft.json')
-                                        ->acceptedFileTypes(['application/json'])
-                                        ->storeFiles(false),
-                                ]),
-                            Tab::make('From URL')
-                                ->icon('tabler-world-upload')
-                                ->schema([
-                                    TextInput::make('url')
-                                        ->label('URL')
-                                        ->default(fn (Egg $egg): ?string => $egg->update_url)
-                                        ->hint('Link to the egg file (eg. minecraft.json)')
-                                        ->url(),
-                                ]),
-                        ])
-                        ->contained(false),
-
-                ])
-                ->action(function (array $data, Egg $egg, EggImporterService $eggImportService): void {
-                    if (!empty($data['egg'])) {
-                        try {
-                            $eggImportService->fromFile($data['egg'], $egg);
-                        } catch (Exception $exception) {
-                            Notification::make()
-                                ->title('Import Failed')
-                                ->body($exception->getMessage())
-                                ->danger() // Will Robinson
-                                ->send();
-
-                            report($exception);
-
-                            return;
-                        }
-                    } elseif (!empty($data['url'])) {
-                        try {
-                            $eggImportService->fromUrl($data['url'], $egg);
-                        } catch (Exception $exception) {
-                            Notification::make()
-                                ->title('Import Failed')
-                                ->body($exception->getMessage())
-                                ->danger()
-                                ->send();
-
-                            report($exception);
-
-                            return;
-                        }
-                    }
-
-                    $this->refreshForm();
-                    Notification::make()
-                        ->title('Import Success')
-                        ->success()
-                        ->send();
-                })
-                ->authorize(fn () => auth()->user()->can('import egg')),
+            ExportEggAction::make(),
+            ImportEggAction::make(),
             $this->getSaveFormAction()->formId('form'),
         ];
     }

app/Filament/Admin/Resources/EggResource/Pages/ListEggs.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Filament\Admin\Resources\EggResource\Pages;
+
+use App\Filament\Admin\Resources\EggResource;
+use App\Filament\Components\Actions\ImportEggAction as ImportEggHeaderAction;
+use App\Filament\Components\Tables\Actions\ExportEggAction;
+use App\Filament\Components\Tables\Actions\ImportEggAction;
+use App\Filament\Components\Tables\Actions\UpdateEggAction;
+use App\Models\Egg;
+use Filament\Actions\CreateAction as CreateHeaderAction;
+use Filament\Resources\Pages\ListRecords;
+use Filament\Tables\Actions\BulkActionGroup;
+use Filament\Tables\Actions\CreateAction;
+use Filament\Tables\Actions\DeleteBulkAction;
+use Filament\Tables\Actions\EditAction;
+use Filament\Tables\Columns\TextColumn;
+use Filament\Tables\Table;
+
+class ListEggs extends ListRecords
+{
+    protected static string $resource = EggResource::class;
+
+    public function table(Table $table): Table
+    {
+        return $table
+            ->searchable(true)
+            ->defaultPaginationPageOption(25)
+            ->checkIfRecordIsSelectableUsing(fn (Egg $egg) => $egg->servers_count <= 0)
+            ->columns([
+                TextColumn::make('id')
+                    ->label('Id')
+                    ->hidden(),
+                TextColumn::make('name')
+                    ->icon('tabler-egg')
+                    ->description(fn ($record): ?string => (strlen($record->description) > 120) ? substr($record->description, 0, 120).'...' : $record->description)
+                    ->wrap()
+                    ->searchable()
+                    ->sortable(),
+                TextColumn::make('servers_count')
+                    ->counts('servers')
+                    ->icon('tabler-server')
+                    ->label('Servers'),
+            ])
+            ->actions([
+                EditAction::make(),
+                ExportEggAction::make(),
+                UpdateEggAction::make(),
+            ])
+            ->bulkActions([
+                BulkActionGroup::make([
+                    DeleteBulkAction::make()
+                        ->authorize(fn () => auth()->user()->can('delete egg')),
+                ]),
+            ])
+            ->emptyStateIcon('tabler-eggs')
+            ->emptyStateDescription('')
+            ->emptyStateHeading('No Eggs')
+            ->emptyStateActions([
+                CreateAction::make()
+                    ->label('Create Egg'),
+                ImportEggAction::make(),
+            ]);
+    }
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            ImportEggHeaderAction::make(),
+            CreateHeaderAction::make()
+                ->label('Create Egg'),
+        ];
+    }
+}

app/Filament/Admin/Resources/EggResource/RelationManagers/ServersRelationManager.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\EggResource\RelationManagers;
+namespace App\Filament\Admin\Resources\EggResource\RelationManagers;
 
 use App\Models\Server;
 use Filament\Resources\RelationManagers\RelationManager;

app/Filament/Admin/Resources/MountResource.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources;
+namespace App\Filament\Admin\Resources;
 
-use App\Filament\Resources\MountResource\Pages;
+use App\Filament\Admin\Resources\MountResource\Pages;
 use App\Models\Mount;
 use Filament\Resources\Resource;
 
@@ -14,6 +14,8 @@ class MountResource extends Resource
 
     protected static ?string $navigationGroup = 'Advanced';
 
+    protected static ?string $recordTitleAttribute = 'name';
+
     public static function getNavigationBadge(): ?string
     {
         return static::getModel()::count() ?: null;

app/Filament/Admin/Resources/MountResource/Pages/CreateMount.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\MountResource\Pages;
+namespace App\Filament\Admin\Resources\MountResource\Pages;
 
-use App\Filament\Resources\MountResource;
+use App\Filament\Admin\Resources\MountResource;
 use Filament\Forms\Components\Group;
 use Filament\Forms\Components\Hidden;
 use Filament\Forms\Components\Section;
@@ -21,6 +21,18 @@ class CreateMount extends CreateRecord
 
     protected static bool $canCreateAnother = false;
 
+    protected function getHeaderActions(): array
+    {
+        return [
+            $this->getCreateFormAction()->formId('form'),
+        ];
+    }
+
+    protected function getFormActions(): array
+    {
+        return [];
+    }
+
     public function form(Form $form): Form
     {
         return $form

app/Filament/Admin/Resources/MountResource/Pages/EditMount.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\MountResource\Pages;
+namespace App\Filament\Admin\Resources\MountResource\Pages;
 
-use App\Filament\Resources\MountResource;
+use App\Filament\Admin\Resources\MountResource;
 use Filament\Actions;
 use Filament\Forms\Components\Group;
 use Filament\Forms\Components\Section;

app/Filament/Admin/Resources/MountResource/Pages/ListMounts.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\MountResource\Pages;
+namespace App\Filament\Admin\Resources\MountResource\Pages;
 
-use App\Filament\Resources\MountResource;
+use App\Filament\Admin\Resources\MountResource;
 use App\Models\Mount;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;

app/Filament/Admin/Resources/NodeResource.php

@@ -1,10 +1,9 @@
 <?php
 
-namespace App\Filament\Resources;
+namespace App\Filament\Admin\Resources;
 
-use App\Filament\Resources\NodeResource\Pages;
-use App\Filament\Resources\NodeResource\RelationManagers\AllocationsRelationManager;
-use App\Filament\Resources\NodeResource\RelationManagers\NodesRelationManager;
+use App\Filament\Admin\Resources\NodeResource\Pages;
+use App\Filament\Admin\Resources\NodeResource\RelationManagers;
 use App\Models\Node;
 use Filament\Resources\Resource;
 
@@ -24,8 +23,8 @@ class NodeResource extends Resource
     public static function getRelations(): array
     {
         return [
-            AllocationsRelationManager::class,
-            NodesRelationManager::class,
+            RelationManagers\AllocationsRelationManager::class,
+            RelationManagers\NodesRelationManager::class,
         ];
     }
 

app/Filament/Admin/Resources/NodeResource/Pages/CreateNode.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\NodeResource\Pages;
+namespace App\Filament\Admin\Resources\NodeResource\Pages;
 
-use App\Filament\Resources\NodeResource;
+use App\Filament\Admin\Resources\NodeResource;
 use Filament\Forms;
 use Filament\Forms\Components\Actions\Action;
 use Filament\Forms\Components\Grid;
@@ -23,8 +23,6 @@ class CreateNode extends CreateRecord
 
     protected static bool $canCreateAnother = false;
 
-    protected ?string $subheading = 'which is a machine that runs your Servers';
-
     public function form(Forms\Form $form): Forms\Form
     {
         return $form

app/Filament/Admin/Resources/NodeResource/Pages/EditNode.php

@@ -1,9 +1,10 @@
 <?php
 
-namespace App\Filament\Resources\NodeResource\Pages;
+namespace App\Filament\Admin\Resources\NodeResource\Pages;
 
-use App\Filament\Resources\NodeResource;
+use App\Filament\Admin\Resources\NodeResource;
 use App\Models\Node;
+use App\Services\Helpers\SoftwareVersionService;
 use App\Services\Nodes\NodeAutoDeployService;
 use App\Services\Nodes\NodeUpdateService;
 use Filament\Actions;
@@ -47,7 +48,12 @@ class EditNode extends EditRecord
                     Tab::make('')
                         ->label('Overview')
                         ->icon('tabler-chart-area-line-filled')
-                        ->columns(6)
+                        ->columns([
+                            'default' => 4,
+                            'sm' => 2,
+                            'md' => 4,
+                            'lg' => 4,
+                        ])
                         ->schema([
                             Fieldset::make()
                                 ->label('Node Information')
@@ -55,7 +61,7 @@ class EditNode extends EditRecord
                                 ->schema([
                                     Placeholder::make('')
                                         ->label('Wings Version')
-                                        ->content(fn (Node $node) => $node->systemInformation()['version'] ?? 'Unknown'),
+                                        ->content(fn (Node $node, SoftwareVersionService $versionService) => ($node->systemInformation()['version'] ?? 'Unknown') . ' (Latest: ' . $versionService->latestWingsVersion() . ')'),
                                     Placeholder::make('')
                                         ->label('CPU Threads')
                                         ->content(fn (Node $node) => $node->systemInformation()['cpu_count'] ?? 0),
@@ -66,8 +72,20 @@ class EditNode extends EditRecord
                                         ->label('Kernel')
                                         ->content(fn (Node $node) => $node->systemInformation()['kernel_version'] ?? 'Unknown'),
                                 ]),
-                            View::make('filament.components.node-cpu-chart')->columnSpan(3),
-                            View::make('filament.components.node-memory-chart')->columnSpan(3),
+                            View::make('filament.components.node-cpu-chart')
+                                ->columnSpan([
+                                    'default' => 4,
+                                    'sm' => 1,
+                                    'md' => 2,
+                                    'lg' => 2,
+                                ]),
+                            View::make('filament.components.node-memory-chart')
+                                ->columnSpan([
+                                    'default' => 4,
+                                    'sm' => 1,
+                                    'md' => 2,
+                                    'lg' => 2,
+                                ]),
                             // TODO: Make purdy View::make('filament.components.node-storage-chart')->columnSpan(3),
                         ]),
                     Tab::make('Basic Settings')

app/Filament/Admin/Resources/NodeResource/Pages/ListNodes.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace App\Filament\Resources\NodeResource\Pages;
+namespace App\Filament\Admin\Resources\NodeResource\Pages;
 
-use App\Filament\Resources\NodeResource;
+use App\Filament\Admin\Resources\NodeResource;
+use App\Filament\Components\Tables\Columns\NodeHealthColumn;
 use App\Models\Node;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
@@ -27,10 +28,7 @@ class ListNodes extends ListRecords
                     ->label('UUID')
                     ->searchable()
                     ->hidden(),
-                IconColumn::make('health')
-                    ->alignCenter()
-                    ->state(fn (Node $node) => $node)
-                    ->view('livewire.columns.version-column'),
+                NodeHealthColumn::make('health'),
                 TextColumn::make('name')
                     ->icon('tabler-server-2')
                     ->sortable()

app/Filament/Admin/Resources/NodeResource/RelationManagers/AllocationsRelationManager.php

@@ -1,13 +1,16 @@
 <?php
 
-namespace App\Filament\Resources\NodeResource\RelationManagers;
+namespace App\Filament\Admin\Resources\NodeResource\RelationManagers;
 
+use App\Filament\Admin\Resources\ServerResource\Pages\CreateServer;
 use App\Models\Allocation;
 use App\Models\Node;
 use App\Services\Allocations\AssignmentService;
+use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TagsInput;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
+use Filament\Forms\Get;
 use Filament\Forms\Set;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables;
@@ -47,15 +50,20 @@ class AllocationsRelationManager extends RelationManager
 
             // All assigned allocations
             ->checkIfRecordIsSelectableUsing(fn (Allocation $allocation) => $allocation->server_id === null)
+            ->paginationPageOptions(['10', '20', '50', '100', '200', '500', '1000'])
             ->searchable()
+            ->selectCurrentPageOnly() //Prevent people from trying to nuke 30,000 ports at once.... -,-
             ->columns([
-                TextColumn::make('id'),
+                TextColumn::make('id')
+                    ->toggleable()
+                    ->toggledHiddenByDefault(),
                 TextColumn::make('port')
                     ->searchable()
                     ->label('Port'),
                 TextColumn::make('server.name')
                     ->label('Server')
                     ->icon('tabler-brand-docker')
+                    ->visibleFrom('md')
                     ->searchable()
                     ->url(fn (Allocation $allocation): string => $allocation->server ? route('filament.admin.resources.servers.edit', ['record' => $allocation->server]) : ''),
                 TextInputColumn::make('ip_alias')
@@ -65,21 +73,17 @@ class AllocationsRelationManager extends RelationManager
                     ->searchable()
                     ->label('IP'),
             ])
-            ->filters([
-                //
-            ])
-            ->actions([
-                //
-            ])
             ->headerActions([
                 Tables\Actions\Action::make('create new allocation')->label('Create Allocations')
                     ->form(fn () => [
-                        TextInput::make('allocation_ip')
-                            ->datalist($this->getOwnerRecord()->ipAddresses())
+                        Select::make('allocation_ip')
+                            ->options(collect($this->getOwnerRecord()->ipAddresses())->mapWithKeys(fn (string $ip) => [$ip => $ip]))
                             ->label('IP Address')
                             ->inlineLabel()
                             ->ipv4()
                             ->helperText("Usually your machine's public IP unless you are port forwarding.")
+                            ->afterStateUpdated(fn (Set $set) => $set('allocation_ports', []))
+                            ->live()
                             ->required(),
                         TextInput::make('allocation_alias')
                             ->label('Alias')
@@ -97,54 +101,10 @@ class AllocationsRelationManager extends RelationManager
                             ->label('Ports')
                             ->inlineLabel()
                             ->live()
-                            ->afterStateUpdated(function ($state, Set $set) {
-                                $ports = collect();
-                                $update = false;
-                                foreach ($state as $portEntry) {
-                                    if (!str_contains($portEntry, '-')) {
-                                        if (is_numeric($portEntry)) {
-                                            $ports->push((int) $portEntry);
-
-                                            continue;
-                                        }
-
-                                        // Do not add non numerical ports
-                                        $update = true;
-
-                                        continue;
-                                    }
-
-                                    $update = true;
-                                    [$start, $end] = explode('-', $portEntry);
-                                    if (!is_numeric($start) || !is_numeric($end)) {
-                                        continue;
-                                    }
-
-                                    $start = max((int) $start, 0);
-                                    $end = min((int) $end, 2 ** 16 - 1);
-                                    foreach (range($start, $end) as $i) {
-                                        $ports->push($i);
-                                    }
-                                }
-
-                                $uniquePorts = $ports->unique()->values();
-                                if ($ports->count() > $uniquePorts->count()) {
-                                    $update = true;
-                                    $ports = $uniquePorts;
-                                }
-
-                                $sortedPorts = $ports->sort()->values();
-                                if ($sortedPorts->all() !== $ports->all()) {
-                                    $update = true;
-                                    $ports = $sortedPorts;
-                                }
-
-                                $ports = $ports->filter(fn ($port) => $port > 1024 && $port < 65535)->values();
-
-                                if ($update) {
-                                    $set('allocation_ports', $ports->all());
-                                }
-                            })
+                            ->disabled(fn (Get $get) => empty($get('allocation_ip')))
+                            ->afterStateUpdated(fn ($state, Set $set, Get $get) => $set('allocation_ports',
+                                CreateServer::retrieveValidPorts($this->getOwnerRecord(), $state, $get('allocation_ip')))
+                            )
                             ->splitKeys(['Tab', ' ', ','])
                             ->required(),
                     ])

app/Filament/Admin/Resources/NodeResource/RelationManagers/NodesRelationManager.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\NodeResource\RelationManagers;
+namespace App\Filament\Admin\Resources\NodeResource\RelationManagers;
 
 use App\Models\Server;
 use Filament\Resources\RelationManagers\RelationManager;

app/Filament/Admin/Resources/NodeResource/Widgets/NodeCpuChart.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\NodeResource\Widgets;
+namespace App\Filament\Admin\Resources\NodeResource\Widgets;
 
 use App\Models\Node;
 use Carbon\Carbon;
@@ -26,8 +26,8 @@ class NodeCpuChart extends ChartWidget
         $cpu = collect(cache()->get("nodes.$node->id.cpu_percent"))
             ->slice(-10)
             ->map(fn ($value, $key) => [
-                'cpu' => Number::format($value * $threads, maxPrecision: 2, locale: auth()->user()->language),
-                'timestamp' => Carbon::createFromTimestamp($key, (auth()->user()->timezone ?? 'UTC'))->format('H:i:s'),
+                'cpu' => Number::format($value * $threads, maxPrecision: 2),
+                'timestamp' => Carbon::createFromTimestamp($key, auth()->user()->timezone ?? 'UTC')->format('H:i:s'),
             ])
             ->all();
 
@@ -43,6 +43,7 @@ class NodeCpuChart extends ChartWidget
                 ],
             ],
             'labels' => array_column($cpu, 'timestamp'),
+            'locale' => auth()->user()->language ?? 'en',
         ];
     }
 

app/Filament/Admin/Resources/NodeResource/Widgets/NodeMemoryChart.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\NodeResource\Widgets;
+namespace App\Filament\Admin\Resources\NodeResource\Widgets;
 
 use App\Models\Node;
 use Carbon\Carbon;
@@ -24,8 +24,8 @@ class NodeMemoryChart extends ChartWidget
 
         $memUsed = collect(cache()->get("nodes.$node->id.memory_used"))->slice(-10)
             ->map(fn ($value, $key) => [
-                'memory' => Number::format(config('panel.use_binary_prefix') ? $value / 1024 / 1024 / 1024 : $value / 1000 / 1000 / 1000, maxPrecision: 2, locale: auth()->user()->language),
-                'timestamp' => Carbon::createFromTimestamp($key, (auth()->user()->timezone ?? 'UTC'))->format('H:i:s'),
+                'memory' => Number::format(config('panel.use_binary_prefix') ? $value / 1024 / 1024 / 1024 : $value / 1000 / 1000 / 1000, maxPrecision: 2),
+                'timestamp' => Carbon::createFromTimestamp($key, auth()->user()->timezone ?? 'UTC')->format('H:i:s'),
             ])
             ->all();
 
@@ -41,6 +41,7 @@ class NodeMemoryChart extends ChartWidget
                 ],
             ],
             'labels' => array_column($memUsed, 'timestamp'),
+            'locale' => auth()->user()->language ?? 'en',
         ];
     }
 

app/Filament/Admin/Resources/NodeResource/Widgets/NodeStorageChart.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\NodeResource\Widgets;
+namespace App\Filament\Admin\Resources\NodeResource\Widgets;
 
 use App\Models\Node;
 use Filament\Widgets\ChartWidget;

app/Filament/Admin/Resources/RoleResource.php

@@ -1,12 +1,11 @@
 <?php
 
-namespace App\Filament\Resources;
+namespace App\Filament\Admin\Resources;
 
 use App\Enums\RolePermissionModels;
 use App\Enums\RolePermissionPrefixes;
-use App\Filament\Resources\RoleResource\Pages;
+use App\Filament\Admin\Resources\RoleResource\Pages;
 use App\Models\Role;
-use Filament\Facades\Filament;
 use Filament\Forms\Components\Actions\Action;
 use Filament\Forms\Components\CheckboxList;
 use Filament\Forms\Components\Component;
@@ -25,6 +24,8 @@ class RoleResource extends Resource
 
     protected static ?string $navigationIcon = 'tabler-users-group';
 
+    protected static ?string $navigationGroup = 'Advanced';
+
     protected static ?string $recordTitleAttribute = 'name';
 
     public static function getNavigationBadge(): ?string
@@ -71,7 +72,7 @@ class RoleResource extends Resource
                     ->disabled(fn (Get $get) => $get('name') === Role::ROOT_ADMIN),
                 TextInput::make('guard_name')
                     ->label('Guard Name')
-                    ->default(Filament::getCurrentPanel()?->getAuthGuard() ?? '')
+                    ->default(Role::DEFAULT_GUARD_NAME)
                     ->nullable()
                     ->hidden(),
                 Fieldset::make('Permissions')
@@ -92,6 +93,8 @@ class RoleResource extends Resource
             $icon = ('\App\Filament\Resources\\' . $model . 'Resource')::getNavigationIcon();
         } elseif (class_exists('\App\Filament\Pages\\' . $model)) {
             $icon = ('\App\Filament\Pages\\' . $model)::getNavigationIcon();
+        } elseif (class_exists('\App\Filament\Server\Resources\\' . $model . 'Resource')) {
+            $icon = ('\App\Filament\Server\Resources\\' . $model . 'Resource')::getNavigationIcon();
         }
 
         return Section::make(Str::headline(Str::plural($model)))

app/Filament/Admin/Resources/RoleResource/Pages/CreateRole.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\RoleResource\Pages;
+namespace App\Filament\Admin\Resources\RoleResource\Pages;
 
-use App\Filament\Resources\RoleResource;
+use App\Filament\Admin\Resources\RoleResource;
 use App\Models\Role;
 use Filament\Resources\Pages\CreateRecord;
 use Illuminate\Support\Arr;
@@ -14,11 +14,23 @@ use Spatie\Permission\Models\Permission;
  */
 class CreateRole extends CreateRecord
 {
+    public Collection $permissions;
+
     protected static string $resource = RoleResource::class;
 
     protected static bool $canCreateAnother = false;
 
-    public Collection $permissions;
+    protected function getHeaderActions(): array
+    {
+        return [
+            $this->getCreateFormAction()->formId('form'),
+        ];
+    }
+
+    protected function getFormActions(): array
+    {
+        return [];
+    }
 
     protected function mutateFormDataBeforeCreate(array $data): array
     {

app/Filament/Admin/Resources/RoleResource/Pages/EditRole.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\RoleResource\Pages;
+namespace App\Filament\Admin\Resources\RoleResource\Pages;
 
-use App\Filament\Resources\RoleResource;
+use App\Filament\Admin\Resources\RoleResource;
 use App\Models\Role;
 use Filament\Actions\DeleteAction;
 use Filament\Resources\Pages\EditRecord;

app/Filament/Admin/Resources/RoleResource/Pages/ListRoles.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\RoleResource\Pages;
+namespace App\Filament\Admin\Resources\RoleResource\Pages;
 
-use App\Filament\Resources\RoleResource;
+use App\Filament\Admin\Resources\RoleResource;
 use App\Models\Role;
 use Filament\Actions\CreateAction;
 use Filament\Resources\Pages\ListRecords;

app/Filament/Admin/Resources/ServerResource.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources;
+namespace App\Filament\Admin\Resources;
 
-use App\Filament\Resources\ServerResource\Pages;
+use App\Filament\Admin\Resources\ServerResource\Pages;
 use App\Models\Server;
 use Filament\Resources\Resource;
 

app/Filament/Admin/Resources/ServerResource/Pages/CreateServer.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\ServerResource\Pages;
+namespace App\Filament\Admin\Resources\ServerResource\Pages;
 
-use App\Filament\Resources\ServerResource;
+use App\Filament\Admin\Resources\ServerResource;
 use App\Models\Allocation;
 use App\Models\Egg;
 use App\Models\Node;
@@ -34,7 +34,9 @@ use Filament\Forms\Components\Wizard\Step;
 use Filament\Forms\Form;
 use Filament\Forms\Get;
 use Filament\Forms\Set;
+use Filament\Notifications\Notification;
 use Filament\Resources\Pages\CreateRecord;
+use Filament\Support\Exceptions\Halt;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Blade;
@@ -68,9 +70,8 @@ class CreateServer extends CreateRecord
                         ->completedIcon('tabler-check')
                         ->columns([
                             'default' => 1,
-                            'sm' => 1,
+                            'sm' => 4,
                             'md' => 4,
-                            'lg' => 6,
                         ])
                         ->schema([
                             TextInput::make('name')
@@ -87,24 +88,51 @@ class CreateServer extends CreateRecord
                                         $set('name', $prefix . $word);
                                     }))
                                 ->columnSpan([
-                                    'default' => 2,
-                                    'sm' => 3,
+                                    'default' => 1,
+                                    'sm' => 2,
                                     'md' => 2,
-                                    'lg' => 3,
                                 ])
                                 ->required()
                                 ->maxLength(255),
 
+                            TextInput::make('external_id')
+                                ->label('External ID')
+                                ->columnSpan([
+                                    'default' => 1,
+                                    'sm' => 2,
+                                    'md' => 2,
+                                ])
+                                ->unique()
+                                ->maxLength(255),
+
+                            Select::make('node_id')
+                                ->disabledOn('edit')
+                                ->prefixIcon('tabler-server-2')
+                                ->default(fn () => ($this->node = Node::query()->latest()->first())?->id)
+                                ->columnSpan([
+                                    'default' => 1,
+                                    'sm' => 2,
+                                    'md' => 2,
+                                ])
+                                ->live()
+                                ->relationship('node', 'name')
+                                ->searchable()
+                                ->preload()
+                                ->afterStateUpdated(function (Set $set, $state) {
+                                    $set('allocation_id', null);
+                                    $this->node = Node::find($state);
+                                })
+                                ->required(),
+
                             Select::make('owner_id')
                                 ->preload()
                                 ->prefixIcon('tabler-user')
                                 ->default(auth()->user()->id)
                                 ->label('Owner')
                                 ->columnSpan([
-                                    'default' => 2,
-                                    'sm' => 3,
-                                    'md' => 3,
-                                    'lg' => 3,
+                                    'default' => 1,
+                                    'sm' => 2,
+                                    'md' => 2,
                                 ])
                                 ->relationship('user', 'username')
                                 ->searchable(['username', 'email'])
@@ -113,6 +141,7 @@ class CreateServer extends CreateRecord
                                     TextInput::make('username')
                                         ->alphaNum()
                                         ->required()
+                                        ->minLength(3)
                                         ->maxLength(255),
 
                                     TextInput::make('email')
@@ -133,36 +162,15 @@ class CreateServer extends CreateRecord
                                 })
                                 ->required(),
 
-                            Select::make('node_id')
-                                ->disabledOn('edit')
-                                ->prefixIcon('tabler-server-2')
-                                ->default(fn () => ($this->node = Node::query()->latest()->first())?->id)
-                                ->columnSpan([
-                                    'default' => 2,
-                                    'sm' => 3,
-                                    'md' => 6,
-                                    'lg' => 6,
-                                ])
-                                ->live()
-                                ->relationship('node', 'name')
-                                ->searchable()
-                                ->preload()
-                                ->afterStateUpdated(function (Set $set, $state) {
-                                    $set('allocation_id', null);
-                                    $this->node = Node::find($state);
-                                })
-                                ->required(),
-
                             Select::make('allocation_id')
                                 ->preload()
                                 ->live()
                                 ->prefixIcon('tabler-network')
                                 ->label('Primary Allocation')
                                 ->columnSpan([
-                                    'default' => 2,
-                                    'sm' => 3,
+                                    'default' => 1,
+                                    'sm' => 2,
                                     'md' => 2,
-                                    'lg' => 3,
                                 ])
                                 ->disabled(fn (Get $get) => $get('node_id') === null)
                                 ->searchable(['ip', 'port', 'ip_alias'])
@@ -190,87 +198,47 @@ class CreateServer extends CreateRecord
                                         ->where('node_id', $get('node_id'))
                                         ->whereNull('server_id'),
                                 )
-                                ->createOptionForm(fn (Get $get) => [
-                                    TextInput::make('allocation_ip')
-                                        ->datalist(Node::find($get('node_id'))?->ipAddresses() ?? [])
-                                        ->label('IP Address')
-                                        ->inlineLabel()
-                                        ->ipv4()
-                                        ->helperText("Usually your machine's public IP unless you are port forwarding.")
-                                        // ->selectablePlaceholder(false)
-                                        ->required(),
-                                    TextInput::make('allocation_alias')
-                                        ->label('Alias')
-                                        ->inlineLabel()
-                                        ->default(null)
-                                        ->datalist([
-                                            $get('name'),
-                                            Egg::find($get('egg_id'))?->name,
-                                        ])
-                                        ->helperText('Optional display name to help you remember what these are.')
-                                        ->required(false),
-                                    TagsInput::make('allocation_ports')
-                                        ->placeholder('Examples: 27015, 27017-27019')
-                                        ->helperText(new HtmlString('
-                                These are the ports that users can connect to this Server through.
-                                <br />
-                                You would have to port forward these on your home network.
-                            '))
-                                        ->label('Ports')
-                                        ->inlineLabel()
-                                        ->live()
-                                        ->afterStateUpdated(function ($state, Set $set) {
-                                            $ports = collect();
-                                            $update = false;
-                                            foreach ($state as $portEntry) {
-                                                if (!str_contains($portEntry, '-')) {
-                                                    if (is_numeric($portEntry)) {
-                                                        $ports->push((int) $portEntry);
+                                ->createOptionForm(function (Get $get) {
+                                    $getPage = $get;
 
-                                                        continue;
-                                                    }
-
-                                                    // Do not add non-numerical ports
-                                                    $update = true;
-
-                                                    continue;
-                                                }
-
-                                                $update = true;
-                                                [$start, $end] = explode('-', $portEntry);
-                                                if (!is_numeric($start) || !is_numeric($end)) {
-                                                    continue;
-                                                }
-
-                                                $start = max((int) $start, 0);
-                                                $end = min((int) $end, 2 ** 16 - 1);
-                                                $range = $start <= $end ? range($start, $end) : range($end, $start);
-                                                foreach ($range as $i) {
-                                                    if ($i > 1024 && $i <= 65535) {
-                                                        $ports->push($i);
-                                                    }
-                                                }
-                                            }
-
-                                            $uniquePorts = $ports->unique()->values();
-                                            if ($ports->count() > $uniquePorts->count()) {
-                                                $update = true;
-                                                $ports = $uniquePorts;
-                                            }
-
-                                            $sortedPorts = $ports->sort()->values();
-                                            if ($sortedPorts->all() !== $ports->all()) {
-                                                $update = true;
-                                                $ports = $sortedPorts;
-                                            }
-
-                                            if ($update) {
-                                                $set('allocation_ports', $ports->all());
-                                            }
-                                        })
-                                        ->splitKeys(['Tab', ' ', ','])
-                                        ->required(),
-                                ])
+                                    return [
+                                        Select::make('allocation_ip')
+                                            ->options(collect(Node::find($get('node_id'))?->ipAddresses())->mapWithKeys(fn (string $ip) => [$ip => $ip]))
+                                            ->label('IP Address')
+                                            ->helperText("Usually your machine's public IP unless you are port forwarding.")
+                                            ->afterStateUpdated(fn (Set $set) => $set('allocation_ports', []))
+                                            ->inlineLabel()
+                                            ->ipv4()
+                                            ->live()
+                                            ->required(),
+                                        TextInput::make('allocation_alias')
+                                            ->label('Alias')
+                                            ->inlineLabel()
+                                            ->default(null)
+                                            ->datalist([
+                                                $get('name'),
+                                                Egg::find($get('egg_id'))?->name,
+                                            ])
+                                            ->helperText('Optional display name to help you remember what these are.')
+                                            ->required(false),
+                                        TagsInput::make('allocation_ports')
+                                            ->placeholder('Examples: 27015, 27017-27019')
+                                            ->helperText(new HtmlString('
+                                            These are the ports that users can connect to this Server through.
+                                            <br />
+                                            You would have to port forward these on your home network.
+                                        '))
+                                            ->label('Ports')
+                                            ->inlineLabel()
+                                            ->live()
+                                            ->disabled(fn (Get $get) => empty($get('allocation_ip')))
+                                            ->afterStateUpdated(fn ($state, Set $set, Get $get) => $set('allocation_ports',
+                                                CreateServer::retrieveValidPorts(Node::find($getPage('node_id')), $state, $get('allocation_ip')))
+                                            )
+                                            ->splitKeys(['Tab', ' ', ','])
+                                            ->required(),
+                                    ];
+                                })
                                 ->createOptionUsing(function (array $data, Get $get, AssignmentService $assignmentService): int {
                                     return collect(
                                         $assignmentService->handle(Node::find($get('node_id')), $data)
@@ -281,10 +249,9 @@ class CreateServer extends CreateRecord
                             Repeater::make('allocation_additional')
                                 ->label('Additional Allocations')
                                 ->columnSpan([
-                                    'default' => 2,
-                                    'sm' => 3,
-                                    'md' => 3,
-                                    'lg' => 3,
+                                    'default' => 1,
+                                    'sm' => 2,
+                                    'md' => 2,
                                 ])
                                 ->addActionLabel('Add Allocation')
                                 ->disabled(fn (Get $get) => $get('allocation_id') === null)
@@ -320,10 +287,9 @@ class CreateServer extends CreateRecord
                                 ->placeholder('Description')
                                 ->rows(3)
                                 ->columnSpan([
-                                    'default' => 2,
-                                    'sm' => 6,
-                                    'md' => 6,
-                                    'lg' => 6,
+                                    'default' => 1,
+                                    'sm' => 4,
+                                    'md' => 4,
                                 ])
                                 ->label('Description'),
                         ]),
@@ -534,6 +500,37 @@ class CreateServer extends CreateRecord
                                     'lg' => 3,
                                 ])
                                 ->schema([
+                                    Grid::make()
+                                        ->columns(4)
+                                        ->columnSpanFull()
+                                        ->schema([
+                                            ToggleButtons::make('unlimited_cpu')
+                                                ->label('CPU')->inlineLabel()->inline()
+                                                ->default(true)
+                                                ->afterStateUpdated(fn (Set $set) => $set('cpu', 0))
+                                                ->live()
+                                                ->options([
+                                                    true => 'Unlimited',
+                                                    false => 'Limited',
+                                                ])
+                                                ->colors([
+                                                    true => 'primary',
+                                                    false => 'warning',
+                                                ])
+                                                ->columnSpan(2),
+
+                                            TextInput::make('cpu')
+                                                ->dehydratedWhenHidden()
+                                                ->hidden(fn (Get $get) => $get('unlimited_cpu'))
+                                                ->label('CPU Limit')->inlineLabel()
+                                                ->suffix('%')
+                                                ->default(0)
+                                                ->required()
+                                                ->columnSpan(2)
+                                                ->numeric()
+                                                ->minValue(0)
+                                                ->helperText('100% equals one CPU core.'),
+                                        ]),
                                     Grid::make()
                                         ->columns(4)
                                         ->columnSpanFull()
@@ -564,7 +561,6 @@ class CreateServer extends CreateRecord
                                                 ->numeric()
                                                 ->minValue(0),
                                         ]),
-
                                     Grid::make()
                                         ->columns(4)
                                         ->columnSpanFull()
@@ -596,37 +592,6 @@ class CreateServer extends CreateRecord
                                                 ->minValue(0),
                                         ]),
 
-                                    Grid::make()
-                                        ->columns(4)
-                                        ->columnSpanFull()
-                                        ->schema([
-                                            ToggleButtons::make('unlimited_cpu')
-                                                ->label('CPU')->inlineLabel()->inline()
-                                                ->default(true)
-                                                ->afterStateUpdated(fn (Set $set) => $set('cpu', 0))
-                                                ->live()
-                                                ->options([
-                                                    true => 'Unlimited',
-                                                    false => 'Limited',
-                                                ])
-                                                ->colors([
-                                                    true => 'primary',
-                                                    false => 'warning',
-                                                ])
-                                                ->columnSpan(2),
-
-                                            TextInput::make('cpu')
-                                                ->dehydratedWhenHidden()
-                                                ->hidden(fn (Get $get) => $get('unlimited_cpu'))
-                                                ->label('CPU Limit')->inlineLabel()
-                                                ->suffix('%')
-                                                ->default(0)
-                                                ->required()
-                                                ->columnSpan(2)
-                                                ->numeric()
-                                                ->minValue(0)
-                                                ->helperText('100% equals one CPU core.'),
-                                        ]),
                                 ]),
 
                             Fieldset::make('Advanced Limits')
@@ -638,6 +603,40 @@ class CreateServer extends CreateRecord
                                     'lg' => 3,
                                 ])
                                 ->schema([
+                                    Hidden::make('io')
+                                        ->helperText('The IO performance relative to other running containers')
+                                        ->label('Block IO Proportion')
+                                        ->default(500),
+
+                                    Grid::make()
+                                        ->columns(4)
+                                        ->columnSpanFull()
+                                        ->schema([
+                                            ToggleButtons::make('cpu_pinning')
+                                                ->label('CPU Pinning')->inlineLabel()->inline()
+                                                ->default(false)
+                                                ->afterStateUpdated(fn (Set $set) => $set('threads', []))
+                                                ->live()
+                                                ->options([
+                                                    false => 'Disabled',
+                                                    true => 'Enabled',
+                                                ])
+                                                ->colors([
+                                                    false => 'success',
+                                                    true => 'warning',
+                                                ])
+                                                ->columnSpan(2),
+
+                                            TagsInput::make('threads')
+                                                ->dehydratedWhenHidden()
+                                                ->hidden(fn (Get $get) => !$get('cpu_pinning'))
+                                                ->label('Pinned Threads')->inlineLabel()
+                                                ->required(fn (Get $get) => $get('cpu_pinning'))
+                                                ->columnSpan(2)
+                                                ->separator()
+                                                ->splitKeys([','])
+                                                ->placeholder('Add pinned thread, e.g. 0 or 2-4'),
+                                        ]),
                                     Grid::make()
                                         ->columns(4)
                                         ->columnSpanFull()
@@ -686,41 +685,6 @@ class CreateServer extends CreateRecord
                                                 ->integer(),
                                         ]),
 
-                                    Hidden::make('io')
-                                        ->helperText('The IO performance relative to other running containers')
-                                        ->label('Block IO Proportion')
-                                        ->default(500),
-
-                                    Grid::make()
-                                        ->columns(4)
-                                        ->columnSpanFull()
-                                        ->schema([
-                                            ToggleButtons::make('cpu_pinning')
-                                                ->label('CPU Pinning')->inlineLabel()->inline()
-                                                ->default(false)
-                                                ->afterStateUpdated(fn (Set $set) => $set('threads', []))
-                                                ->live()
-                                                ->options([
-                                                    false => 'Disabled',
-                                                    true => 'Enabled',
-                                                ])
-                                                ->colors([
-                                                    false => 'success',
-                                                    true => 'warning',
-                                                ])
-                                                ->columnSpan(2),
-
-                                            TagsInput::make('threads')
-                                                ->dehydratedWhenHidden()
-                                                ->hidden(fn (Get $get) => !$get('cpu_pinning'))
-                                                ->label('Pinned Threads')->inlineLabel()
-                                                ->required(fn (Get $get) => $get('cpu_pinning'))
-                                                ->columnSpan(2)
-                                                ->separator()
-                                                ->splitKeys([','])
-                                                ->placeholder('Add pinned thread, e.g. 0 or 2-4'),
-                                        ]),
-
                                     Grid::make()
                                         ->columns(4)
                                         ->columnSpanFull()
@@ -787,6 +751,7 @@ class CreateServer extends CreateRecord
                                 ->schema([
                                     Select::make('select_image')
                                         ->label('Image Name')
+                                        ->live()
                                         ->afterStateUpdated(fn (Set $set, $state) => $set('image', $state))
                                         ->options(function ($state, Get $get, Set $set) {
                                             $egg = Egg::query()->find($get('egg_id'));
@@ -811,7 +776,7 @@ class CreateServer extends CreateRecord
 
                                     TextInput::make('image')
                                         ->label('Image')
-                                        ->debounce(500)
+                                        ->required()
                                         ->afterStateUpdated(function ($state, Get $get, Set $set) {
                                             $egg = Egg::query()->find($get('egg_id'));
                                             $images = $egg->docker_images ?? [];
@@ -874,7 +839,18 @@ class CreateServer extends CreateRecord
     {
         $data['allocation_additional'] = collect($data['allocation_additional'])->filter()->all();
 
-        return $this->serverCreationService->handle($data);
+        try {
+            return $this->serverCreationService->handle($data);
+        } catch (Exception $exception) {
+            Notification::make()
+                ->title('Could not create server')
+                ->body($exception->getMessage())
+                ->color('danger')
+                ->danger()
+                ->send();
+
+            throw new Halt();
+        }
     }
 
     private function shouldHideComponent(Get $get, Component $component): bool
@@ -907,4 +883,88 @@ class CreateServer extends CreateRecord
             ->mapWithKeys(fn ($value) => [$value => $value])
             ->all();
     }
+
+    public static function retrieveValidPorts(Node $node, array $portEntries, string $ip): array
+    {
+        $portRangeLimit = AssignmentService::PORT_RANGE_LIMIT;
+        $portFloor = AssignmentService::PORT_FLOOR;
+        $portCeil = AssignmentService::PORT_CEIL;
+
+        $ports = collect();
+
+        $existingPorts = $node
+            ->allocations()
+            ->where('ip', $ip)
+            ->pluck('port')
+            ->all();
+
+        foreach ($portEntries as $portEntry) {
+            $start = $end = $portEntry;
+            if (str_contains($portEntry, '-')) {
+                [$start, $end] = explode('-', $portEntry);
+            }
+
+            if (!is_numeric($start) || !is_numeric($end)) {
+                Notification::make()
+                    ->title('Invalid Port Range')
+                    ->danger()
+                    ->body("Your port range are not valid integers: $portEntry")
+                    ->send();
+
+                continue;
+            }
+
+            $start = (int) $start;
+            $end = (int) $end;
+            $range = $start <= $end ? range($start, $end) : range($end, $start);
+
+            if (count($range) > $portRangeLimit) {
+                Notification::make()
+                    ->title('Too many ports at one time!')
+                    ->danger()
+                    ->body("The current limit is $portRangeLimit number of ports at one time.")
+                    ->send();
+
+                continue;
+            }
+
+            foreach ($range as $i) {
+                // Invalid port number
+                if ($i <= $portFloor || $i > $portCeil) {
+                    Notification::make()
+                        ->title('Port not in valid range')
+                        ->danger()
+                        ->body("$i is not in the valid port range between $portFloor-$portCeil")
+                        ->send();
+
+                    continue;
+                }
+
+                // Already exists
+                if (in_array($i, $existingPorts)) {
+                    Notification::make()
+                        ->title('Port already in use')
+                        ->danger()
+                        ->body("$i is already with an allocation")
+                        ->send();
+
+                    continue;
+                }
+
+                $ports->push($i);
+            }
+        }
+
+        $uniquePorts = $ports->unique()->values();
+        if ($ports->count() > $uniquePorts->count()) {
+            $ports = $uniquePorts;
+        }
+
+        $sortedPorts = $ports->sort()->values();
+        if ($sortedPorts->all() !== $ports->all()) {
+            $ports = $sortedPorts;
+        }
+
+        return $ports->all();
+    }
 }

app/Filament/Admin/Resources/ServerResource/Pages/EditServer.php

@@ -1,20 +1,26 @@
 <?php
 
-namespace App\Filament\Resources\ServerResource\Pages;
+namespace App\Filament\Admin\Resources\ServerResource\Pages;
 
 use App\Enums\ContainerStatus;
 use App\Enums\ServerState;
-use App\Filament\Resources\ServerResource;
-use App\Http\Controllers\Admin\ServersController;
+use App\Filament\Admin\Resources\ServerResource;
+use App\Filament\Admin\Resources\ServerResource\RelationManagers\AllocationsRelationManager;
+use App\Filament\Components\Forms\Actions\RotateDatabasePasswordAction;
+use App\Filament\Server\Pages\Console;
 use App\Models\Database;
+use App\Models\DatabaseHost;
 use App\Models\Egg;
+use App\Models\Mount;
 use App\Models\Server;
 use App\Models\ServerVariable;
 use App\Services\Databases\DatabaseManagementService;
-use App\Services\Databases\DatabasePasswordService;
+use App\Services\Eggs\EggChangerService;
 use App\Services\Servers\RandomWordService;
+use App\Services\Servers\ReinstallServerService;
 use App\Services\Servers\ServerDeletionService;
 use App\Services\Servers\SuspensionService;
+use App\Services\Servers\ToggleInstallService;
 use App\Services\Servers\TransferServerService;
 use Closure;
 use Exception;
@@ -25,6 +31,7 @@ use Filament\Forms\Components\CheckboxList;
 use Filament\Forms\Components\Fieldset;
 use Filament\Forms\Components\Grid;
 use Filament\Forms\Components\Hidden;
+use Filament\Forms\Components\KeyValue;
 use Filament\Forms\Components\Repeater;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\Tabs;
@@ -32,6 +39,7 @@ use Filament\Forms\Components\Tabs\Tab;
 use Filament\Forms\Components\TagsInput;
 use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
+use Filament\Forms\Components\Toggle;
 use Filament\Forms\Components\ToggleButtons;
 use Filament\Forms\Form;
 use Filament\Forms\Get;
@@ -153,6 +161,7 @@ class EditServer extends EditRecord
                                         'md' => 2,
                                         'lg' => 3,
                                     ])
+                                    ->unique()
                                     ->maxLength(255),
                                 Select::make('node_id')
                                     ->label('Node')
@@ -176,6 +185,35 @@ class EditServer extends EditRecord
                                         'lg' => 3,
                                     ])
                                     ->schema([
+                                        Grid::make()
+                                            ->columns(4)
+                                            ->columnSpanFull()
+                                            ->schema([
+                                                ToggleButtons::make('unlimited_cpu')
+                                                    ->label('CPU')->inlineLabel()->inline()
+                                                    ->afterStateUpdated(fn (Set $set) => $set('cpu', 0))
+                                                    ->formatStateUsing(fn (Get $get) => $get('cpu') == 0)
+                                                    ->live()
+                                                    ->options([
+                                                        true => 'Unlimited',
+                                                        false => 'Limited',
+                                                    ])
+                                                    ->colors([
+                                                        true => 'primary',
+                                                        false => 'warning',
+                                                    ])
+                                                    ->columnSpan(2),
+
+                                                TextInput::make('cpu')
+                                                    ->dehydratedWhenHidden()
+                                                    ->hidden(fn (Get $get) => $get('unlimited_cpu'))
+                                                    ->label('CPU Limit')->inlineLabel()
+                                                    ->suffix('%')
+                                                    ->required()
+                                                    ->columnSpan(2)
+                                                    ->numeric()
+                                                    ->minValue(0),
+                                            ]),
                                         Grid::make()
                                             ->columns(4)
                                             ->columnSpanFull()
@@ -235,36 +273,6 @@ class EditServer extends EditRecord
                                                     ->numeric()
                                                     ->minValue(0),
                                             ]),
-
-                                        Grid::make()
-                                            ->columns(4)
-                                            ->columnSpanFull()
-                                            ->schema([
-                                                ToggleButtons::make('unlimited_cpu')
-                                                    ->label('CPU')->inlineLabel()->inline()
-                                                    ->afterStateUpdated(fn (Set $set) => $set('cpu', 0))
-                                                    ->formatStateUsing(fn (Get $get) => $get('cpu') == 0)
-                                                    ->live()
-                                                    ->options([
-                                                        true => 'Unlimited',
-                                                        false => 'Limited',
-                                                    ])
-                                                    ->colors([
-                                                        true => 'primary',
-                                                        false => 'warning',
-                                                    ])
-                                                    ->columnSpan(2),
-
-                                                TextInput::make('cpu')
-                                                    ->dehydratedWhenHidden()
-                                                    ->hidden(fn (Get $get) => $get('unlimited_cpu'))
-                                                    ->label('CPU Limit')->inlineLabel()
-                                                    ->suffix('%')
-                                                    ->required()
-                                                    ->columnSpan(2)
-                                                    ->numeric()
-                                                    ->minValue(0),
-                                            ]),
                                     ]),
 
                                 Fieldset::make('Advanced Limits')
@@ -279,6 +287,36 @@ class EditServer extends EditRecord
                                             ->columns(4)
                                             ->columnSpanFull()
                                             ->schema([
+                                                Grid::make()
+                                                    ->columns(4)
+                                                    ->columnSpanFull()
+                                                    ->schema([
+                                                        ToggleButtons::make('cpu_pinning')
+                                                            ->label('CPU Pinning')->inlineLabel()->inline()
+                                                            ->default(false)
+                                                            ->afterStateUpdated(fn (Set $set) => $set('threads', []))
+                                                            ->formatStateUsing(fn (Get $get) => !empty($get('threads')))
+                                                            ->live()
+                                                            ->options([
+                                                                false => 'Disabled',
+                                                                true => 'Enabled',
+                                                            ])
+                                                            ->colors([
+                                                                false => 'success',
+                                                                true => 'warning',
+                                                            ])
+                                                            ->columnSpan(2),
+
+                                                        TagsInput::make('threads')
+                                                            ->dehydratedWhenHidden()
+                                                            ->hidden(fn (Get $get) => !$get('cpu_pinning'))
+                                                            ->label('Pinned Threads')->inlineLabel()
+                                                            ->required(fn (Get $get) => $get('cpu_pinning'))
+                                                            ->columnSpan(2)
+                                                            ->separator()
+                                                            ->splitKeys([','])
+                                                            ->placeholder('Add pinned thread, e.g. 0 or 2-4'),
+                                                    ]),
                                                 ToggleButtons::make('swap_support')
                                                     ->live()
                                                     ->label('Swap Memory')->inlineLabel()->inline()
@@ -330,37 +368,6 @@ class EditServer extends EditRecord
                                             ->helperText('The IO performance relative to other running containers')
                                             ->label('Block IO Proportion'),
 
-                                        Grid::make()
-                                            ->columns(4)
-                                            ->columnSpanFull()
-                                            ->schema([
-                                                ToggleButtons::make('cpu_pinning')
-                                                    ->label('CPU Pinning')->inlineLabel()->inline()
-                                                    ->default(false)
-                                                    ->afterStateUpdated(fn (Set $set) => $set('threads', []))
-                                                    ->formatStateUsing(fn (Get $get) => !empty($get('threads')))
-                                                    ->live()
-                                                    ->options([
-                                                        false => 'Disabled',
-                                                        true => 'Enabled',
-                                                    ])
-                                                    ->colors([
-                                                        false => 'success',
-                                                        true => 'warning',
-                                                    ])
-                                                    ->columnSpan(2),
-
-                                                TagsInput::make('threads')
-                                                    ->dehydratedWhenHidden()
-                                                    ->hidden(fn (Get $get) => !$get('cpu_pinning'))
-                                                    ->label('Pinned Threads')->inlineLabel()
-                                                    ->required(fn (Get $get) => $get('cpu_pinning'))
-                                                    ->columnSpan(2)
-                                                    ->separator()
-                                                    ->splitKeys([','])
-                                                    ->placeholder('Add pinned thread, e.g. 0 or 2-4'),
-                                            ]),
-
                                         Grid::make()
                                             ->columns(4)
                                             ->columnSpanFull()
@@ -392,16 +399,19 @@ class EditServer extends EditRecord
                                     ])
                                     ->schema([
                                         TextInput::make('allocation_limit')
+                                            ->label('Allocations')
                                             ->suffixIcon('tabler-network')
                                             ->required()
                                             ->minValue(0)
                                             ->numeric(),
                                         TextInput::make('database_limit')
+                                            ->label('Databases')
                                             ->suffixIcon('tabler-database')
                                             ->required()
                                             ->minValue(0)
                                             ->numeric(),
                                         TextInput::make('backup_limit')
+                                            ->label('Backups')
                                             ->suffixIcon('tabler-copy-check')
                                             ->required()
                                             ->minValue(0)
@@ -412,11 +422,12 @@ class EditServer extends EditRecord
                                         'default' => 1,
                                         'sm' => 2,
                                         'md' => 3,
-                                        'lg' => 3,
+                                        'lg' => 4,
                                     ])
                                     ->schema([
                                         Select::make('select_image')
                                             ->label('Image Name')
+                                            ->live()
                                             ->afterStateUpdated(fn (Set $set, $state) => $set('image', $state))
                                             ->options(function ($state, Get $get, Set $set) {
                                                 $egg = Egg::query()->find($get('egg_id'));
@@ -432,11 +443,16 @@ class EditServer extends EditRecord
                                                 return array_flip($images) + ['ghcr.io/custom-image' => 'Custom Image'];
                                             })
                                             ->selectablePlaceholder(false)
-                                            ->columnSpan(1),
+                                            ->columnSpan([
+                                                'default' => 1,
+                                                'sm' => 2,
+                                                'md' => 3,
+                                                'lg' => 2,
+                                            ]),
 
                                         TextInput::make('image')
                                             ->label('Image')
-                                            ->debounce(500)
+                                            ->required()
                                             ->afterStateUpdated(function ($state, Get $get, Set $set) {
                                                 $egg = Egg::query()->find($get('egg_id'));
                                                 $images = $egg->docker_images ?? [];
@@ -448,9 +464,14 @@ class EditServer extends EditRecord
                                                 }
                                             })
                                             ->placeholder('Enter a custom Image')
-                                            ->columnSpan(2),
+                                            ->columnSpan([
+                                                'default' => 1,
+                                                'sm' => 2,
+                                                'md' => 3,
+                                                'lg' => 2,
+                                            ]),
 
-                                        Forms\Components\KeyValue::make('docker_labels')
+                                        KeyValue::make('docker_labels')
                                             ->label('Container Labels')
                                             ->keyLabel('Label Name')
                                             ->valueLabel('Label Description')
@@ -467,7 +488,7 @@ class EditServer extends EditRecord
                             ])
                             ->schema([
                                 Select::make('egg_id')
-                                    ->disabledOn('edit')
+                                    ->disabled()
                                     ->prefixIcon('tabler-egg')
                                     ->columnSpan([
                                         'default' => 6,
@@ -478,7 +499,28 @@ class EditServer extends EditRecord
                                     ->relationship('egg', 'name')
                                     ->searchable()
                                     ->preload()
-                                    ->required(),
+                                    ->required()
+                                    ->hintAction(
+                                        Action::make('change_egg')
+                                            ->action(function (array $data, Server $server, EggChangerService $service) {
+                                                $service->handle($server, $data['egg_id'], $data['keepOldVariables']);
+
+                                                // Use redirect instead of fillForm to prevent server variables from duplicating
+                                                $this->redirect($this->getUrl(['record' => $server, 'tab' => '-egg-tab']), true);
+                                            })
+                                            ->form(fn (Server $server) => [
+                                                Select::make('egg_id')
+                                                    ->label('New Egg')
+                                                    ->prefixIcon('tabler-egg')
+                                                    ->options(fn () => Egg::all()->filter(fn (Egg $egg) => $egg->id !== $server->egg->id)->mapWithKeys(fn (Egg $egg) => [$egg->id => $egg->name]))
+                                                    ->searchable()
+                                                    ->preload()
+                                                    ->required(),
+                                                Toggle::make('keepOldVariables')
+                                                    ->label('Keep old variables if possible?')
+                                                    ->default(true),
+                                            ])
+                                    ),
 
                                 ToggleButtons::make('skip_scripts')
                                     ->label('Run Egg Install Script?')->inline()
@@ -506,23 +548,19 @@ class EditServer extends EditRecord
                                     ->label('Startup Command')
                                     ->required()
                                     ->columnSpan(6)
-                                    ->rows(function ($state) {
-                                        return str($state)->explode("\n")->reduce(
-                                            fn (int $carry, $line) => $carry + floor(strlen($line) / 125),
-                                            0
-                                        );
-                                    }),
+                                    ->autosize(),
 
                                 Textarea::make('defaultStartup')
                                     ->hintAction(CopyAction::make())
                                     ->label('Default Startup Command')
                                     ->disabled()
+                                    ->autosize()
+                                    ->columnSpan(6)
                                     ->formatStateUsing(function ($state, Get $get) {
                                         $egg = Egg::query()->find($get('egg_id'));
 
                                         return $egg->startup;
-                                    })
-                                    ->columnSpan(6),
+                                    }),
 
                                 Repeater::make('server_variables')
                                     ->relationship('serverVariables', function (Builder $query) {
@@ -596,14 +634,16 @@ class EditServer extends EditRecord
                             ->schema([
                                 CheckboxList::make('mounts')
                                     ->relationship('mounts')
-                                    ->options(fn (Server $server) => $server->node->mounts->mapWithKeys(fn ($mount) => [$mount->id => $mount->name]))
-                                    ->descriptions(fn (Server $server) => $server->node->mounts->mapWithKeys(fn ($mount) => [$mount->id => "$mount->source -> $mount->target"]))
+                                    ->options(fn (Server $server) => $server->node->mounts->filter(fn (Mount $mount) => $mount->eggs->contains($server->egg))->mapWithKeys(fn (Mount $mount) => [$mount->id => $mount->name]))
+                                    ->descriptions(fn (Server $server) => $server->node->mounts->mapWithKeys(fn (Mount $mount) => [$mount->id => "$mount->source -> $mount->target"]))
                                     ->label('Mounts')
                                     ->helperText(fn (Server $server) => $server->node->mounts->isNotEmpty() ? '' : 'No Mounts exist for this Node')
                                     ->columnSpanFull(),
                             ]),
                         Tab::make('Databases')
+                            ->hidden(fn () => !auth()->user()->can('viewList database'))
                             ->icon('tabler-database')
+                            ->columns(4)
                             ->schema([
                                 Repeater::make('databases')
                                     ->grid()
@@ -617,44 +657,105 @@ class EditServer extends EditRecord
                                             ->formatStateUsing(fn ($record) => $record->database)
                                             ->hintAction(
                                                 Action::make('Delete')
+                                                    ->authorize(fn (Database $database) => auth()->user()->can('delete database', $database))
                                                     ->color('danger')
                                                     ->icon('tabler-trash')
-                                                    ->action(fn (DatabaseManagementService $databaseManagementService, $record) => $databaseManagementService->delete($record))
+                                                    ->requiresConfirmation()
+                                                    ->modalIcon('tabler-database-x')
+                                                    ->modalHeading('Delete Database?')
+                                                    ->modalSubmitActionLabel(fn (Get $get) => 'Delete ' . $get('database') . '?')
+                                                    ->modalDescription(fn (Get $get) => 'Are you sure you want to delete ' . $get('database') . '?')
+                                                    ->action(function (DatabaseManagementService $databaseManagementService, $record) {
+                                                        $databaseManagementService->delete($record);
+                                                        $this->fillForm();
+                                                    })
                                             ),
                                         TextInput::make('username')
                                             ->disabled()
                                             ->formatStateUsing(fn ($record) => $record->username)
-                                            ->columnSpan(2),
+                                            ->columnSpan(1),
                                         TextInput::make('password')
                                             ->disabled()
-                                            ->hintAction(
-                                                Action::make('rotate')
-                                                    ->icon('tabler-refresh')
-                                                    ->requiresConfirmation()
-                                                    ->action(fn (DatabasePasswordService $service, $record, $set, $get) => $this->rotatePassword($service, $record, $set, $get))
-                                            )
-                                            ->formatStateUsing(fn (Database $database) => $database->password)
-                                            ->columnSpan(2),
+                                            ->password()
+                                            ->revealable()
+                                            ->columnSpan(1)
+                                            ->hintAction(RotateDatabasePasswordAction::make())
+                                            ->formatStateUsing(fn (Database $database) => $database->password),
                                         TextInput::make('remote')
                                             ->disabled()
-                                            ->formatStateUsing(fn ($record) => $record->remote)
+                                            ->formatStateUsing(fn (Database $record) => $record->remote === '%' ? 'Anywhere ( % )' : $record->remote)
                                             ->columnSpan(1)
                                             ->label('Connections From'),
                                         TextInput::make('max_connections')
                                             ->disabled()
-                                            ->formatStateUsing(fn ($record) => $record->max_connections)
+                                            ->formatStateUsing(fn (Database $record) => $record->max_connections === 0 ? 'Unlimited' : $record->max_connections)
                                             ->columnSpan(1),
-                                        TextInput::make('JDBC')
+                                        TextInput::make('jdbc')
                                             ->disabled()
+                                            ->password()
+                                            ->revealable()
                                             ->label('JDBC Connection String')
                                             ->columnSpan(2)
-                                            ->formatStateUsing(fn (Get $get, $record) => 'jdbc:mysql://' . $get('username') . ':' . urlencode($record->password) . '@' . $record->host->host . ':' . $record->host->port . '/' . $get('database')),
+                                            ->formatStateUsing(fn (Database $record) => $record->jdbc),
                                     ])
                                     ->relationship('databases')
                                     ->deletable(false)
                                     ->addable(false)
                                     ->columnSpan(4),
-                            ])->columns(4),
+                                Forms\Components\Actions::make([
+                                    Action::make('createDatabase')
+                                        ->authorize(fn () => auth()->user()->can('create database'))
+                                        ->disabled(fn () => DatabaseHost::query()->count() < 1)
+                                        ->label(fn () => DatabaseHost::query()->count() < 1 ? 'No Database Hosts' : 'Create Database')
+                                        ->color(fn () => DatabaseHost::query()->count() < 1 ? 'danger' : 'primary')
+                                        ->modalSubmitActionLabel('Create Database')
+                                        ->action(function (array $data, DatabaseManagementService $service, Server $server, RandomWordService $randomWordService) {
+                                            if (empty($data['database'])) {
+                                                $data['database'] = $randomWordService->word() . random_int(1, 420);
+                                            }
+                                            if (empty($data['remote'])) {
+                                                $data['remote'] = '%';
+                                            }
+
+                                            $data['database'] = $service->generateUniqueDatabaseName($data['database'], $server->id);
+
+                                            try {
+                                                $service->setValidateDatabaseLimit(false)->create($server, $data);
+                                            } catch (Exception $e) {
+                                                Notification::make()
+                                                    ->title('Failed to Create Database')
+                                                    ->body($e->getMessage())
+                                                    ->danger()
+                                                    ->persistent()->send();
+                                            }
+                                            $this->fillForm();
+                                        })
+                                        ->form([
+                                            Select::make('database_host_id')
+                                                ->label('Database Host')
+                                                ->required()
+                                                ->placeholder('Select Database Host')
+                                                ->options(fn (Server $server) => DatabaseHost::query()
+                                                    ->whereHas('nodes', fn ($query) => $query->where('nodes.id', $server->node_id))
+                                                    ->pluck('name', 'id')
+                                                )
+                                                ->default(fn () => (DatabaseHost::query()->first())?->id)
+                                                ->selectablePlaceholder(false),
+                                            TextInput::make('database')
+                                                ->label('Database Name')
+                                                ->alphaDash()
+                                                ->prefix(fn (Server $server) => 's' . $server->id . '_')
+                                                ->hintIcon('tabler-question-mark')
+                                                ->hintIconTooltip('Leaving this blank will auto generate a random name'),
+                                            TextInput::make('remote')
+                                                ->columnSpan(1)
+                                                ->regex('/^[\w\-\/.%:]+$/')
+                                                ->label('Connections From')
+                                                ->hintIcon('tabler-question-mark')
+                                                ->hintIconTooltip('Where connections should be allowed from. Leave blank to allow connections from anywhere.'),
+                                        ]),
+                                ])->alignCenter()->columnSpanFull(),
+                            ]),
                         Tab::make('Actions')
                             ->icon('tabler-settings')
                             ->schema([
@@ -673,8 +774,8 @@ class EditServer extends EditRecord
                                                     Action::make('toggleInstall')
                                                         ->label('Toggle Install Status')
                                                         ->disabled(fn (Server $server) => $server->isSuspended())
-                                                        ->action(function (ServersController $serversController, Server $server) {
-                                                            $serversController->toggleInstall($server);
+                                                        ->action(function (ToggleInstallService $service, Server $server) {
+                                                            $service->handle($server);
 
                                                             $this->refreshFormData(['status', 'docker']);
                                                         }),
@@ -760,7 +861,7 @@ class EditServer extends EditRecord
                                                         ->modalHeading('Are you sure you want to reinstall this server?')
                                                         ->modalDescription('!! This can result in unrecoverable data loss !!')
                                                         ->disabled(fn (Server $server) => $server->isSuspended())
-                                                        ->action(fn (ServersController $serversController, Server $server) => $serversController->reinstallServer($server)),
+                                                        ->action(fn (ReinstallServerService $service, Server $server) => $service->handle($server)),
                                                 ])->fullWidth(),
                                                 ToggleButtons::make('')
                                                     ->hint('This will reinstall the server with the assigned egg install script.'),
@@ -795,13 +896,13 @@ class EditServer extends EditRecord
                 ->action(function (Server $server, ServerDeletionService $service) {
                     $service->handle($server);
 
-                    return redirect(ListServers::getUrl());
+                    return redirect(ListServers::getUrl(panel: 'admin'));
                 })
                 ->authorize(fn (Server $server) => auth()->user()->can('delete server', $server)),
             Actions\Action::make('console')
                 ->label('Console')
                 ->icon('tabler-terminal')
-                ->url(fn (Server $server) => "/server/$server->uuid_short"),
+                ->url(fn (Server $server) => Console::getUrl(panel: 'server', tenant: $server)),
             $this->getSaveFormAction()->formId('form'),
         ];
 
@@ -826,7 +927,7 @@ class EditServer extends EditRecord
     public function getRelationManagers(): array
     {
         return [
-            ServerResource\RelationManagers\AllocationsRelationManager::class,
+            AllocationsRelationManager::class,
         ];
     }
 
@@ -856,13 +957,4 @@ class EditServer extends EditRecord
             ->mapWithKeys(fn ($value) => [$value => $value])
             ->all();
     }
-
-    protected function rotatePassword(DatabasePasswordService $service, Database $record, Set $set, Get $get): void
-    {
-        $newPassword = $service->handle($record);
-        $jdbcString = 'jdbc:mysql://' . $get('username') . ':' . urlencode($newPassword) . '@' . $record->host->host . ':' . $record->host->port . '/' . $get('database');
-
-        $set('password', $newPassword);
-        $set('JDBC', $jdbcString);
-    }
 }

app/Filament/Admin/Resources/ServerResource/Pages/ListServers.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace App\Filament\Resources\ServerResource\Pages;
+namespace App\Filament\Admin\Resources\ServerResource\Pages;
 
-use App\Filament\Resources\ServerResource;
+use App\Filament\Server\Pages\Console;
+use App\Filament\Admin\Resources\ServerResource;
 use App\Models\Server;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
@@ -82,8 +83,8 @@ class ListServers extends ListRecords
             ->actions([
                 Action::make('View')
                     ->icon('tabler-terminal')
-                    ->url(fn (Server $server) => "/server/$server->uuid_short")
-                    ->authorize(fn () => auth()->user()->can('view server')),
+                    ->url(fn (Server $server) => Console::getUrl(panel: 'server', tenant: $server))
+                    ->authorize(fn (Server $server) => auth()->user()->canAccessTenant($server)),
                 EditAction::make(),
             ])
             ->emptyStateIcon('tabler-brand-docker')

app/Filament/Admin/Resources/ServerResource/RelationManagers/AllocationsRelationManager.php

@@ -1,13 +1,16 @@
 <?php
 
-namespace App\Filament\Resources\ServerResource\RelationManagers;
+namespace App\Filament\Admin\Resources\ServerResource\RelationManagers;
 
+use App\Filament\Admin\Resources\ServerResource\Pages\CreateServer;
 use App\Models\Allocation;
 use App\Models\Server;
 use App\Services\Allocations\AssignmentService;
+use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TagsInput;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
+use Filament\Forms\Get;
 use Filament\Forms\Set;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables;
@@ -40,6 +43,7 @@ class AllocationsRelationManager extends RelationManager
     public function table(Table $table): Table
     {
         return $table
+            ->selectCurrentPageOnly()
             ->recordTitleAttribute('ip')
             ->recordTitle(fn (Allocation $allocation) => "$allocation->ip:$allocation->port")
             ->checkIfRecordIsSelectableUsing(fn (Allocation $record) => $record->id !== $this->getOwnerRecord()->allocation_id)
@@ -70,12 +74,13 @@ class AllocationsRelationManager extends RelationManager
                 CreateAction::make()->label('Create Allocation')
                     ->createAnother(false)
                     ->form(fn () => [
-                        TextInput::make('allocation_ip')
-                            ->datalist($this->getOwnerRecord()->node->ipAddresses())
+                        Select::make('allocation_ip')
+                            ->options(collect($this->getOwnerRecord()->node->ipAddresses())->mapWithKeys(fn (string $ip) => [$ip => $ip]))
                             ->label('IP Address')
                             ->inlineLabel()
                             ->ipv4()
                             ->helperText("Usually your machine's public IP unless you are port forwarding.")
+                            ->afterStateUpdated(fn (Set $set) => $set('allocation_ports', []))
                             ->required(),
                         TextInput::make('allocation_alias')
                             ->label('Alias')
@@ -93,54 +98,9 @@ class AllocationsRelationManager extends RelationManager
                             ->label('Ports')
                             ->inlineLabel()
                             ->live()
-                            ->afterStateUpdated(function ($state, Set $set) {
-                                $ports = collect();
-                                $update = false;
-                                foreach ($state as $portEntry) {
-                                    if (!str_contains($portEntry, '-')) {
-                                        if (is_numeric($portEntry)) {
-                                            $ports->push((int) $portEntry);
-
-                                            continue;
-                                        }
-
-                                        // Do not add non numerical ports
-                                        $update = true;
-
-                                        continue;
-                                    }
-
-                                    $update = true;
-                                    [$start, $end] = explode('-', $portEntry);
-                                    if (!is_numeric($start) || !is_numeric($end)) {
-                                        continue;
-                                    }
-
-                                    $start = max((int) $start, 0);
-                                    $end = min((int) $end, 2 ** 16 - 1);
-                                    foreach (range($start, $end) as $i) {
-                                        $ports->push($i);
-                                    }
-                                }
-
-                                $uniquePorts = $ports->unique()->values();
-                                if ($ports->count() > $uniquePorts->count()) {
-                                    $update = true;
-                                    $ports = $uniquePorts;
-                                }
-
-                                $sortedPorts = $ports->sort()->values();
-                                if ($sortedPorts->all() !== $ports->all()) {
-                                    $update = true;
-                                    $ports = $sortedPorts;
-                                }
-
-                                $ports = $ports->filter(fn ($port) => $port > 1024 && $port < 65535)->values();
-
-                                if ($update) {
-                                    $set('allocation_ports', $ports->all());
-                                }
-                            })
+                            ->afterStateUpdated(fn ($state, Set $set, Get $get) => $set('allocation_ports',
+                                CreateServer::retrieveValidPorts($this->getOwnerRecord()->node, $state, $get('allocation_ip')))
+                            )
                             ->splitKeys(['Tab', ' ', ','])
                             ->required(),
                     ])
@@ -149,7 +109,8 @@ class AllocationsRelationManager extends RelationManager
                     ->multiple()
                     ->associateAnother(false)
                     ->preloadRecordSelect()
-                    ->recordSelectOptionsQuery(fn ($query) => $query->whereBelongsTo($this->getOwnerRecord()->node))
+                    ->recordSelectOptionsQuery(fn ($query) => $query->whereBelongsTo($this->getOwnerRecord()->node)->whereNull('server_id'))
+                    ->recordSelectSearchColumns(['ip', 'port'])
                     ->label('Add Allocation'),
             ])
             ->bulkActions([

app/Filament/Admin/Resources/UserResource.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Filament\Resources;
+namespace App\Filament\Admin\Resources;
 
-use App\Filament\Resources\UserResource\Pages;
-use App\Filament\Resources\UserResource\RelationManagers\ServersRelationManager;
+use App\Filament\Admin\Resources\UserResource\Pages;
+use App\Filament\Admin\Resources\UserResource\RelationManagers;
 use App\Models\User;
 use Filament\Resources\Resource;
 
@@ -23,7 +23,7 @@ class UserResource extends Resource
     public static function getRelations(): array
     {
         return [
-            ServersRelationManager::class,
+            RelationManagers\ServersRelationManager::class,
         ];
     }
 
@@ -31,6 +31,7 @@ class UserResource extends Resource
     {
         return [
             'index' => Pages\ListUsers::route('/'),
+            'create' => Pages\CreateUser::route('/create'),
             'edit' => Pages\EditUser::route('/{record}/edit'),
         ];
     }

app/Filament/Admin/Resources/UserResource/Pages/CreateUser.php

@@ -0,0 +1,83 @@
+<?php
+
+namespace App\Filament\Admin\Resources\UserResource\Pages;
+
+use App\Filament\Admin\Resources\UserResource;
+use App\Models\Role;
+use App\Services\Users\UserCreationService;
+use Filament\Forms\Components\CheckboxList;
+use Filament\Forms\Components\TextInput;
+use Filament\Forms\Form;
+use Filament\Resources\Pages\CreateRecord;
+use Illuminate\Database\Eloquent\Model;
+
+class CreateUser extends CreateRecord
+{
+    protected static string $resource = UserResource::class;
+
+    protected static bool $canCreateAnother = false;
+
+    private UserCreationService $service;
+
+    public function boot(UserCreationService $service): void
+    {
+        $this->service = $service;
+    }
+
+    public function form(Form $form): Form
+    {
+        return $form
+            ->columns(['default' => 1, 'lg' => 3])
+            ->schema([
+                TextInput::make('username')
+                    ->alphaNum()
+                    ->required()
+                    ->unique()
+                    ->minLength(3)
+                    ->maxLength(255),
+                TextInput::make('email')
+                    ->email()
+                    ->required()
+                    ->unique()
+                    ->maxLength(255),
+                TextInput::make('password')
+                    ->hintIcon('tabler-question-mark')
+                    ->hintIconTooltip('Providing a user password is optional. New user email will prompt users to create a password the first time they login.')
+                    ->password(),
+                CheckboxList::make('roles')
+                    ->disableOptionWhen(fn (string $value): bool => $value == Role::getRootAdmin()->id)
+                    ->relationship('roles', 'name')
+                    ->dehydrated()
+                    ->label('Admin Roles')
+                    ->columnSpanFull()
+                    ->bulkToggleable(false),
+            ]);
+    }
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            $this->getCreateFormAction()->formId('form'),
+        ];
+    }
+
+    protected function getFormActions(): array
+    {
+        return [];
+    }
+
+    protected function handleRecordCreation(array $data): Model
+    {
+        $data['root_admin'] = false;
+
+        $roles = $data['roles'];
+        $roles = collect($roles)->map(fn ($role) => Role::findById($role));
+        unset($data['roles']);
+
+        $user = $this->service->handle($data);
+
+        $user->syncRoles($roles);
+
+        return $user;
+    }
+}

app/Filament/Admin/Resources/UserResource/Pages/EditUser.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\UserResource\Pages;
+namespace App\Filament\Admin\Resources\UserResource\Pages;
 
-use App\Filament\Resources\UserResource;
+use App\Filament\Admin\Resources\UserResource;
 use App\Models\Role;
 use App\Models\User;
 use Filament\Actions\DeleteAction;
@@ -24,19 +24,25 @@ class EditUser extends EditRecord
         return $form
             ->schema([
                 Section::make()->schema([
-                    TextInput::make('username')->required()->maxLength(255),
-                    TextInput::make('email')->email()->required()->maxLength(255),
+                    TextInput::make('username')
+                        ->required()
+                        ->minLength(3)
+                        ->maxLength(255),
+                    TextInput::make('email')
+                        ->email()
+                        ->required()
+                        ->maxLength(255),
                     TextInput::make('password')
                         ->dehydrateStateUsing(fn (string $state): string => Hash::make($state))
                         ->dehydrated(fn (?string $state): bool => filled($state))
-                        ->required(fn (string $operation): bool => $operation === 'create')
                         ->password(),
                     Select::make('language')
                         ->required()
                         ->hidden()
                         ->default('en')
                         ->options(fn (User $user) => $user->getAvailableLanguages()),
-                    Hidden::make('skipValidation')->default(true),
+                    Hidden::make('skipValidation')
+                        ->default(true),
                     CheckboxList::make('roles')
                         ->disabled(fn (User $user) => $user->id === auth()->user()->id)
                         ->disableOptionWhen(fn (string $value): bool => $value == Role::getRootAdmin()->id)
@@ -44,7 +50,8 @@ class EditUser extends EditRecord
                         ->label('Admin Roles')
                         ->columnSpanFull()
                         ->bulkToggleable(false),
-                ])->columns(),
+                ])
+                    ->columns(['default' => 1, 'lg' => 3]),
             ]);
     }
 

app/Filament/Admin/Resources/UserResource/Pages/ListUsers.php

@@ -0,0 +1,83 @@
+<?php
+
+namespace App\Filament\Admin\Resources\UserResource\Pages;
+
+use App\Filament\Admin\Resources\UserResource;
+use App\Models\User;
+use Filament\Actions\CreateAction;
+use Filament\Resources\Pages\ListRecords;
+use Filament\Tables\Actions\BulkActionGroup;
+use Filament\Tables\Actions\DeleteBulkAction;
+use Filament\Tables\Actions\EditAction;
+use Filament\Tables\Columns\IconColumn;
+use Filament\Tables\Columns\ImageColumn;
+use Filament\Tables\Columns\TextColumn;
+use Filament\Tables\Table;
+
+class ListUsers extends ListRecords
+{
+    protected static string $resource = UserResource::class;
+
+    public function table(Table $table): Table
+    {
+        return $table
+            ->searchable(false)
+            ->columns([
+                ImageColumn::make('picture')
+                    ->visibleFrom('lg')
+                    ->label('')
+                    ->extraImgAttributes(['class' => 'rounded-full'])
+                    ->defaultImageUrl(fn (User $user) => 'https://gravatar.com/avatar/' . md5(strtolower($user->email))),
+                TextColumn::make('external_id')
+                    ->searchable()
+                    ->hidden(),
+                TextColumn::make('uuid')
+                    ->label('UUID')
+                    ->hidden()
+                    ->searchable(),
+                TextColumn::make('username')
+                    ->searchable(),
+                TextColumn::make('email')
+                    ->searchable()
+                    ->icon('tabler-mail'),
+                IconColumn::make('use_totp')
+                    ->label('2FA')
+                    ->visibleFrom('lg')
+                    ->icon(fn (User $user) => $user->use_totp ? 'tabler-lock' : 'tabler-lock-open-off')
+                    ->boolean()
+                    ->sortable(),
+                TextColumn::make('roles.name')
+                    ->label('Roles')
+                    ->badge()
+                    ->icon('tabler-users-group')
+                    ->placeholder('No roles'),
+                TextColumn::make('servers_count')
+                    ->counts('servers')
+                    ->icon('tabler-server')
+                    ->label('Servers'),
+                TextColumn::make('subusers_count')
+                    ->visibleFrom('sm')
+                    ->label('Subusers')
+                    ->counts('subusers')
+                    ->icon('tabler-users'),
+            ])
+            ->actions([
+                EditAction::make(),
+            ])
+            ->checkIfRecordIsSelectableUsing(fn (User $user) => auth()->user()->id !== $user->id && !$user->servers_count)
+            ->bulkActions([
+                BulkActionGroup::make([
+                    DeleteBulkAction::make()
+                        ->authorize(fn () => auth()->user()->can('delete user')),
+                ]),
+            ]);
+    }
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            CreateAction::make()
+                ->label('Create User'),
+        ];
+    }
+}

app/Filament/Admin/Resources/UserResource/RelationManagers/ServersRelationManager.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\UserResource\RelationManagers;
+namespace App\Filament\Admin\Resources\UserResource\RelationManagers;
 
 use App\Enums\ServerState;
 use App\Models\Server;

app/Filament/Admin/Resources/WebhookResource.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Filament\Admin\Resources;
+
+use App\Filament\Admin\Resources\WebhookResource\Pages;
+use App\Models\WebhookConfiguration;
+use Filament\Resources\Resource;
+
+class WebhookResource extends Resource
+{
+    protected static ?string $model = WebhookConfiguration::class;
+
+    protected static ?string $modelLabel = 'Webhook';
+
+    protected static ?string $pluralModelLabel = 'Webhooks';
+
+    protected static ?string $navigationIcon = 'tabler-webhook';
+
+    protected static ?string $navigationGroup = 'Advanced';
+
+    protected static ?string $recordTitleAttribute = 'description';
+
+    public static function getNavigationBadge(): ?string
+    {
+        return static::getModel()::count() ?: null;
+    }
+
+    public static function getPages(): array
+    {
+        return [
+            'index' => Pages\ListWebhookConfigurations::route('/'),
+            'create' => Pages\CreateWebhookConfiguration::route('/create'),
+            'edit' => Pages\EditWebhookConfiguration::route('/{record}/edit'),
+        ];
+    }
+}

app/Filament/Admin/Resources/WebhookResource/Pages/CreateWebhookConfiguration.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Filament\Admin\Resources\WebhookResource\Pages;
+
+use App\Filament\Admin\Resources\WebhookResource;
+use App\Models\WebhookConfiguration;
+use Filament\Forms\Components\CheckboxList;
+use Filament\Forms\Components\TextInput;
+use Filament\Forms\Form;
+use Filament\Resources\Pages\CreateRecord;
+
+class CreateWebhookConfiguration extends CreateRecord
+{
+    protected static string $resource = WebhookResource::class;
+
+    protected static bool $canCreateAnother = false;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            $this->getCreateFormAction()->formId('form'),
+        ];
+    }
+
+    protected function getFormActions(): array
+    {
+        return [];
+    }
+
+    public function form(Form $form): Form
+    {
+        return $form
+            ->schema([
+                TextInput::make('endpoint')
+                    ->activeUrl()
+                    ->required(),
+                TextInput::make('description')
+                    ->required(),
+                CheckboxList::make('events')
+                    ->lazy()
+                    ->options(fn () => WebhookConfiguration::filamentCheckboxList())
+                    ->searchable()
+                    ->bulkToggleable()
+                    ->columns(3)
+                    ->columnSpanFull()
+                    ->gridDirection('row')
+                    ->required(),
+            ]);
+    }
+}

app/Filament/Admin/Resources/WebhookResource/Pages/EditWebhookConfiguration.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Filament\Admin\Resources\WebhookResource\Pages;
+
+use App\Models\WebhookConfiguration;
+use App\Filament\Admin\Resources\WebhookResource;
+use Filament\Actions;
+use Filament\Forms\Components\CheckboxList;
+use Filament\Forms\Components\TextInput;
+use Filament\Forms\Form;
+use Filament\Resources\Pages\EditRecord;
+
+class EditWebhookConfiguration extends EditRecord
+{
+    protected static string $resource = WebhookResource::class;
+
+    public function form(Form $form): Form
+    {
+        return $form
+            ->schema([
+                TextInput::make('endpoint')
+                    ->label('Endpoint')
+                    ->activeUrl()
+                    ->required(),
+                TextInput::make('description')
+                    ->label('Description')
+                    ->required(),
+                CheckboxList::make('events')
+                    ->label('Events')
+                    ->lazy()
+                    ->options(fn () => WebhookConfiguration::filamentCheckboxList())
+                    ->searchable()
+                    ->bulkToggleable()
+                    ->columns(3)
+                    ->columnSpanFull()
+                    ->gridDirection('row')
+                    ->required(),
+            ]);
+    }
+
+    protected function getFormActions(): array
+    {
+        return [];
+    }
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            Actions\DeleteAction::make()
+                ->label('Delete')
+                ->modalHeading('Are you sure you want to delete this?')
+                ->modalDescription('')
+                ->modalSubmitActionLabel('Delete'),
+            $this->getSaveFormAction()->formId('form'),
+        ];
+    }
+}

app/Filament/Admin/Resources/WebhookResource/Pages/ListWebhookConfigurations.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Filament\Admin\Resources\WebhookResource\Pages;
+
+use App\Filament\Admin\Resources\WebhookResource;
+use App\Models\WebhookConfiguration;
+use Filament\Actions;
+use Filament\Resources\Pages\ListRecords;
+use Filament\Tables\Actions\CreateAction;
+use Filament\Tables\Columns\TextColumn;
+use Filament\Tables\Table;
+use Filament\Tables\Actions\EditAction;
+use Filament\Tables\Actions\DeleteAction;
+
+class ListWebhookConfigurations extends ListRecords
+{
+    protected static string $resource = WebhookResource::class;
+
+    public function table(Table $table): Table
+    {
+        return $table
+            ->columns([
+                TextColumn::make('description')
+                    ->label('Description'),
+                TextColumn::make('endpoint')
+                    ->label('Endpoint'),
+            ])
+            ->actions([
+                DeleteAction::make()
+                    ->label('Delete'),
+                EditAction::make()
+                    ->label('Edit'),
+            ])
+            ->emptyStateIcon('tabler-webhook')
+            ->emptyStateDescription('')
+            ->emptyStateHeading('No Webhooks')
+            ->emptyStateActions([
+                CreateAction::make('create')
+                    ->label('Create Webhook')
+                    ->button(),
+            ]);
+    }
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            Actions\CreateAction::make()
+                ->label('Create Webhook')
+                ->hidden(fn () => WebhookConfiguration::count() <= 0),
+        ];
+    }
+}

app/Filament/App/Resources/ServerResource.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Filament\App\Resources;
+
+use App\Filament\App\Resources\ServerResource\Pages;
+use App\Models\Server;
+use Filament\Resources\Resource;
+
+class ServerResource extends Resource
+{
+    protected static ?string $model = Server::class;
+
+    protected static ?string $slug = '/';
+
+    protected static bool $shouldRegisterNavigation = false;
+
+    public static function canAccess(): bool
+    {
+        return true;
+    }
+
+    public static function getPages(): array
+    {
+        return [
+            'index' => Pages\ListServers::route('/'),
+        ];
+    }
+}

app/Filament/App/Resources/ServerResource/Pages/ListServers.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Filament\App\Resources\ServerResource\Pages;
+
+use App\Filament\App\Resources\ServerResource;
+use App\Filament\Components\Tables\Columns\ServerEntryColumn;
+use App\Filament\Server\Pages\Console;
+use App\Models\Server;
+use Filament\Resources\Pages\ListRecords;
+use Filament\Tables\Columns\Layout\Stack;
+use Filament\Tables\Filters\SelectFilter;
+use Filament\Tables\Filters\TernaryFilter;
+use Filament\Tables\Table;
+use Illuminate\Database\Eloquent\Builder;
+
+class ListServers extends ListRecords
+{
+    protected static string $resource = ServerResource::class;
+
+    public function table(Table $table): Table
+    {
+        $baseQuery = auth()->user()->can('viewList server') ? Server::query() : auth()->user()->accessibleServers();
+
+        return $table
+            ->paginated(false)
+            ->query(fn () => $baseQuery)
+            ->poll('15s')
+            ->columns([
+                Stack::make([
+                    ServerEntryColumn::make('server_entry')
+                        ->searchable(['name']),
+                ]),
+            ])
+            ->contentGrid([
+                'default' => 1,
+                'md' => 2,
+            ])
+            ->recordUrl(fn (Server $server) => Console::getUrl(panel: 'server', tenant: $server))
+            ->emptyStateIcon('tabler-brand-docker')
+            ->emptyStateDescription('')
+            ->emptyStateHeading('You don\'t have access to any servers!')
+            ->persistFiltersInSession()
+            ->filters([
+                TernaryFilter::make('only_my_servers')
+                    ->label('Owned by')
+                    ->placeholder('All servers')
+                    ->trueLabel('My Servers')
+                    ->falseLabel('Others\' Servers')
+                    ->default()
+                    ->queries(
+                        true: fn (Builder $query) => $query->where('owner_id', auth()->user()->id),
+                        false: fn (Builder $query) => $query->whereNot('owner_id', auth()->user()->id),
+                        blank: fn (Builder $query) => $query,
+                    ),
+                SelectFilter::make('egg')
+                    ->relationship('egg', 'name', fn (Builder $query) => $query->whereIn('id', $baseQuery->pluck('egg_id')))
+                    ->searchable()
+                    ->preload(),
+            ]);
+    }
+}

app/Filament/Components/Actions/ExportEggAction.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Filament\Components\Actions;
+
+use App\Models\Egg;
+use App\Services\Eggs\Sharing\EggExporterService;
+use Filament\Actions\Action;
+
+class ExportEggAction extends Action
+{
+    public static function getDefaultName(): ?string
+    {
+        return 'export';
+    }
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->label('Export');
+
+        $this->authorize(fn () => auth()->user()->can('export egg'));
+
+        $this->action(fn (EggExporterService $service, Egg $egg) => response()->streamDownload(function () use ($service, $egg) {
+            echo $service->handle($egg->id);
+        }, 'egg-' . $egg->getKebabName() . '.json'));
+    }
+}