stan

.github/workflows/ci.yaml

@@ -26,7 +26,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.3, 8.4, 8.5]
+        php: [8.2, 8.3, 8.4, 8.5]
     env:
       DB_CONNECTION: sqlite
       DB_DATABASE: testing.sqlite
@@ -79,8 +79,8 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.5]
-        database: ["mysql:8.4", "mysql:9.6"]
+        php: [8.2, 8.3, 8.4, 8.5]
+        database: ["mysql:8"]
     services:
       database:
         image: ${{ matrix.database }}
@@ -147,8 +147,8 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.5]
-        database: ["mariadb:10.11", "mariadb:11.4"]
+        php: [8.2, 8.3, 8.4, 8.5]
+        database: ["mariadb:10.6", "mariadb:10.11", "mariadb:11.4"]
     services:
       database:
         image: ${{ matrix.database }}
@@ -215,8 +215,8 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.5]
-        database: ["postgres:17", "postgres:18"]
+        php: [8.2, 8.3, 8.4, 8.5]
+        database: ["postgres:14"]
     services:
       database:
         image: ${{ matrix.database }}

Dockerfile

@@ -68,8 +68,6 @@ RUN apk add --no-cache \
     # required for installing plugins. Pulled from https://github.com/pelican-dev/panel/pull/2034
     zip unzip 7zip bzip2-dev yarn git
 
-# Copy composer binary for runtime plugin dependency management
-COPY --from=composer /usr/local/bin/composer /usr/local/bin/composer
 COPY --chown=root:www-data --chmod=770 --from=composerbuild /build .
 COPY --chown=root:www-data --chmod=770 --from=yarnbuild /build/public ./public
 
@@ -85,7 +83,8 @@ RUN mkdir -p /pelican-data/storage /pelican-data/plugins /var/run/supervisord \
 # Allow www-data write permissions where necessary
     && chown -R www-data: /pelican-data .env ./storage ./plugins ./bootstrap/cache /var/run/supervisord /var/www/html/public/storage \
     && chmod -R 770 /pelican-data ./storage ./bootstrap/cache /var/run/supervisord \
-    && chown -R www-data: /usr/local/etc/php/ /usr/local/etc/php-fpm.d/ /var/www/html/composer.json /var/www/html/composer.lock
+    && chown -R www-data: /usr/local/etc/php/ /usr/local/etc/php-fpm.d/
+
 # Configure Supervisor
 COPY docker/supervisord.conf /etc/supervisord.conf
 COPY docker/Caddyfile /etc/caddy/Caddyfile

Dockerfile.dev

@@ -73,8 +73,6 @@ RUN apk add --no-cache \
     # required for installing plugins. Pulled from https://github.com/pelican-dev/panel/pull/2034
     zip unzip 7zip bzip2-dev yarn git
 
-# Copy composer binary for runtime plugin dependency management
-COPY --from=composer /usr/local/bin/composer /usr/local/bin/composer
 COPY --chown=root:www-data --chmod=770 --from=composerbuild /build .
 COPY --chown=root:www-data --chmod=770 --from=yarnbuild /build/public ./public
 
@@ -90,7 +88,7 @@ RUN mkdir -p /pelican-data/storage /pelican-data/plugins /var/run/supervisord \
 # Allow www-data write permissions where necessary
     && chown -R www-data: /pelican-data .env ./storage ./plugins ./bootstrap/cache /var/run/supervisord /var/www/html/public/storage \
     && chmod -R 770 /pelican-data ./storage ./bootstrap/cache /var/run/supervisord \
-    && chown -R www-data: /usr/local/etc/php/ /usr/local/etc/php-fpm.d/ /var/www/html/composer.json /var/www/html/composer.lock
+    && chown -R www-data: /usr/local/etc/php/ /usr/local/etc/php-fpm.d/
 
 # Configure Supervisor
 COPY docker/supervisord.conf /etc/supervisord.conf

app/Console/Commands/Egg/CheckEggUpdatesCommand.php

@@ -8,6 +8,7 @@ use App\Services\Eggs\Sharing\EggExporterService;
 use Exception;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Http;
+use JsonException;
 use Symfony\Component\Yaml\Yaml;
 
 class CheckEggUpdatesCommand extends Command
@@ -21,12 +22,14 @@ class CheckEggUpdatesCommand extends Command
             try {
                 $this->check($egg, $exporterService);
             } catch (Exception $exception) {
-                $this->error("$egg->name: Error ({$exception->getMessage()})");
+                $this->error("{$egg->name}: Error ({$exception->getMessage()})");
             }
         }
     }
 
-    /** @throws Exception */
+    /**
+     * @throws JsonException
+     */
     private function check(Egg $egg, EggExporterService $exporterService): void
     {
         if (is_null($egg->update_url)) {
@@ -42,13 +45,7 @@ class CheckEggUpdatesCommand extends Command
             ? Yaml::parse($exporterService->handle($egg->id, EggFormat::YAML))
             : json_decode($exporterService->handle($egg->id, EggFormat::JSON), true);
 
-        $remote = Http::timeout(5)->connectTimeout(1)->get($egg->update_url);
-
-        if ($remote->failed()) {
-            throw new Exception("HTTP request returned status code {$remote->status()}");
-        }
-
-        $remote = $remote->body();
+        $remote = Http::timeout(5)->connectTimeout(1)->get($egg->update_url)->throw()->body();
         $remote = $isYaml ? Yaml::parse($remote) : json_decode($remote, true);
 
         unset($local['exported_at'], $remote['exported_at']);

app/Console/Commands/Egg/UpdateEggIndexCommand.php

@@ -13,7 +13,7 @@ class UpdateEggIndexCommand extends Command
     public function handle(): int
     {
         try {
-            $data = Http::timeout(5)->connectTimeout(1)->get(config('panel.cdn.egg_index_url'))->throw()->json();
+            $data = Http::timeout(5)->connectTimeout(1)->get('https://raw.githubusercontent.com/pelican-eggs/pelican-eggs.github.io/refs/heads/main/content/pelican.json')->throw()->json();
         } catch (Exception $exception) {
             $this->error($exception->getMessage());
 

app/Console/Commands/Plugin/DisablePluginCommand.php

@@ -16,7 +16,7 @@ class DisablePluginCommand extends Command
     {
         $id = $this->argument('id') ?? $this->choice('Plugin', Plugin::pluck('name', 'id')->toArray());
 
-        $plugin = Plugin::find(str($id)->lower()->toString());
+        $plugin = Plugin::find($id);
 
         if (!$plugin) {
             $this->error('Plugin does not exist!');

app/Console/Commands/Plugin/InstallPluginCommand.php

@@ -18,7 +18,7 @@ class InstallPluginCommand extends Command
     {
         $id = $this->argument('id') ?? $this->choice('Plugin', Plugin::pluck('name', 'id')->toArray());
 
-        $plugin = Plugin::find(str($id)->lower()->toString());
+        $plugin = Plugin::find($id);
 
         if (!$plugin) {
             $this->error('Plugin does not exist!');

app/Console/Commands/Plugin/UninstallPluginCommand.php

@@ -18,7 +18,7 @@ class UninstallPluginCommand extends Command
     {
         $id = $this->argument('id') ?? $this->choice('Plugin', Plugin::pluck('name', 'id')->toArray());
 
-        $plugin = Plugin::find(str($id)->lower()->toString());
+        $plugin = Plugin::find($id);
 
         if (!$plugin) {
             $this->error('Plugin does not exist!');

app/Console/Commands/Plugin/UpdatePluginCommand.php

@@ -17,7 +17,7 @@ class UpdatePluginCommand extends Command
     {
         $id = $this->argument('id') ?? $this->choice('Plugin', Plugin::pluck('name', 'id')->toArray());
 
-        $plugin = Plugin::find(str($id)->lower()->toString());
+        $plugin = Plugin::find($id);
 
         if (!$plugin) {
             $this->error('Plugin does not exist!');

app/Enums/CustomizationKey.php

@@ -12,7 +12,6 @@ enum CustomizationKey: string
     case DashboardLayout = 'dashboard_layout';
 
     case ButtonStyle = 'button_style';
-    case RedirectToAdmin = 'redirect_to_admin';
 
     public function getDefaultValue(): string|int|bool
     {
@@ -24,7 +23,6 @@ enum CustomizationKey: string
             self::TopNavigation => config('panel.filament.default-navigation', 'sidebar'),
             self::DashboardLayout => 'grid',
             self::ButtonStyle => true,
-            self::RedirectToAdmin => false,
         };
     }
 

app/Enums/RolePermissionModels.php

@@ -6,7 +6,6 @@ enum RolePermissionModels: string
 {
     case ApiKey = 'apiKey';
     case Allocation = 'allocation';
-    case BackupHost = 'backupHost';
     case DatabaseHost = 'databaseHost';
     case Database = 'database';
     case Egg = 'egg';

app/Enums/SubuserPermission.php

@@ -50,9 +50,6 @@ enum SubuserPermission: string
 
     case ActivityRead = 'activity.read';
 
-    case MountRead = 'mount.read';
-    case MountUpdate = 'mount.update';
-
     case StartupRead = 'startup.read';
     case StartupUpdate = 'startup.update';
     case StartupDockerImage = 'startup.docker-image';
@@ -60,7 +57,6 @@ enum SubuserPermission: string
     case SettingsRename = 'settings.rename';
     case SettingsDescription = 'settings.description';
     case SettingsReinstall = 'settings.reinstall';
-    case SettingsChangeIcon = 'settings.change-icon';
 
     /** @return string[] */
     public function split(): array
@@ -88,7 +84,6 @@ enum SubuserPermission: string
             'schedule' => TablerIcon::Clock,
             'settings' => TablerIcon::Settings,
             'activity' => TablerIcon::Stack,
-            'mount' => TablerIcon::LayersLinked,
             default => null,
         };
     }

app/Events/User/Deleting.php

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

app/Events/User/PasswordChanged.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Events\User;
-
-use App\Models\User;
-use Illuminate\Foundation\Events\Dispatchable;
-
-final class PasswordChanged
-{
-    use Dispatchable;
-
-    public function __construct(public readonly User $user) {}
-}

app/Exceptions/ManifestDoesNotExistException.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Exceptions;
+
+use App\Exceptions\Solutions\ManifestDoesNotExistSolution;
+use Exception;
+use Spatie\Ignition\Contracts\ProvidesSolution;
+use Spatie\Ignition\Contracts\Solution;
+
+class ManifestDoesNotExistException extends Exception implements ProvidesSolution
+{
+    public function getSolution(): Solution
+    {
+        return new ManifestDoesNotExistSolution();
+    }
+}

app/Exceptions/PluginIdMismatchException.php

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

app/Exceptions/Solutions/ManifestDoesNotExistSolution.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Exceptions\Solutions;
+
+use Spatie\Ignition\Contracts\Solution;
+
+class ManifestDoesNotExistSolution implements Solution
+{
+    public function getSolutionTitle(): string
+    {
+        return "The manifest.json file hasn't been generated yet";
+    }
+
+    public function getSolutionDescription(): string
+    {
+        return 'Run yarn run build:production to build the frontend first.';
+    }
+
+    public function getDocumentationLinks(): array
+    {
+        return [
+            'Docs' => 'https://github.com/pelican/panel/blob/master/package.json',
+        ];
+    }
+}

app/Extensions/BackupAdapter/BackupAdapterSchemaInterface.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Extensions\BackupAdapter;
-
-use App\Models\Backup;
-use App\Models\User;
-use Filament\Schemas\Components\Component;
-
-interface BackupAdapterSchemaInterface
-{
-    public function getId(): string;
-
-    public function getName(): string;
-
-    public function createBackup(Backup $backup): void;
-
-    public function deleteBackup(Backup $backup): void;
-
-    public function getDownloadLink(Backup $backup, User $user): string;
-
-    /** @return Component[] */
-    public function getConfigurationForm(): array;
-}

app/Extensions/BackupAdapter/BackupAdapterService.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace App\Extensions\BackupAdapter;
-
-class BackupAdapterService
-{
-    /** @var array<string, BackupAdapterSchemaInterface> */
-    private array $schemas = [];
-
-    /** @return BackupAdapterSchemaInterface[] */
-    public function getAll(): array
-    {
-        return $this->schemas;
-    }
-
-    public function get(string $id): ?BackupAdapterSchemaInterface
-    {
-        return array_get($this->schemas, $id);
-    }
-
-    public function register(BackupAdapterSchemaInterface $schema): void
-    {
-        if (array_key_exists($schema->getId(), $this->schemas)) {
-            return;
-        }
-
-        $this->schemas[$schema->getId()] = $schema;
-    }
-
-    /** @return array<string, string> */
-    public function getMappings(): array
-    {
-        return collect($this->schemas)->mapWithKeys(fn ($schema) => [$schema->getId() => $schema->getName()])->all();
-    }
-}

app/Extensions/BackupAdapter/Schemas/BackupAdapterSchema.php

@@ -1,14 +0,0 @@
-<?php
-
-namespace App\Extensions\BackupAdapter\Schemas;
-
-use App\Extensions\BackupAdapter\BackupAdapterSchemaInterface;
-use Illuminate\Support\Str;
-
-abstract class BackupAdapterSchema implements BackupAdapterSchemaInterface
-{
-    public function getName(): string
-    {
-        return Str::title($this->getId());
-    }
-}

app/Extensions/BackupAdapter/Schemas/S3BackupSchema.php

@@ -1,207 +0,0 @@
-<?php
-
-namespace App\Extensions\BackupAdapter\Schemas;
-
-use App\Enums\TablerIcon;
-use App\Http\Controllers\Api\Remote\Backups\BackupRemoteUploadController;
-use App\Models\Backup;
-use App\Models\BackupHost;
-use App\Models\User;
-use App\Repositories\Daemon\DaemonBackupRepository;
-use Aws\S3\S3Client;
-use Carbon\CarbonImmutable;
-use Exception;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\Toggle;
-use Filament\Schemas\Components\Component;
-use Filament\Schemas\Components\StateCasts\BooleanStateCast;
-use Illuminate\Support\Arr;
-
-final class S3BackupSchema extends BackupAdapterSchema
-{
-    public function __construct(private readonly DaemonBackupRepository $repository) {}
-
-    private function createClient(BackupHost $backupHost): S3Client
-    {
-        $config = $backupHost->configuration;
-        $config['version'] = 'latest';
-
-        if (!empty($config['key']) && !empty($config['secret'])) {
-            $config['credentials'] = Arr::only($config, ['key', 'secret', 'token']);
-        }
-
-        return new S3Client($config);
-    }
-
-    public function getId(): string
-    {
-        return 's3';
-    }
-
-    public function createBackup(Backup $backup): void
-    {
-        $this->repository->setServer($backup->server)->create($backup);
-    }
-
-    public function deleteBackup(Backup $backup): void
-    {
-        $client = $this->createClient($backup->backupHost);
-
-        $client->deleteObject([
-            'Bucket' => $backup->backupHost->configuration['bucket'],
-            'Key' => "{$backup->server->uuid}/$backup->uuid.tar.gz",
-        ]);
-    }
-
-    public function getDownloadLink(Backup $backup, User $user): string
-    {
-        $client = $this->createClient($backup->backupHost);
-
-        $request = $client->createPresignedRequest(
-            $client->getCommand('GetObject', [
-                'Bucket' => $backup->backupHost->configuration['bucket'],
-                'Key' => "{$backup->server->uuid}/$backup->uuid.tar.gz",
-                'ContentType' => 'application/x-gzip',
-            ]),
-            CarbonImmutable::now()->addMinutes(5)
-        );
-
-        return $request->getUri()->__toString();
-    }
-
-    /** @return Component[] */
-    public function getConfigurationForm(): array
-    {
-        return [
-            TextInput::make('configuration.region')
-                ->label(trans('admin/setting.backup.s3.default_region'))
-                ->required(),
-            TextInput::make('configuration.key')
-                ->label(trans('admin/setting.backup.s3.access_key'))
-                ->required(),
-            TextInput::make('configuration.secret')
-                ->label(trans('admin/setting.backup.s3.secret_key'))
-                ->required(),
-            TextInput::make('configuration.bucket')
-                ->label(trans('admin/setting.backup.s3.bucket'))
-                ->required(),
-            TextInput::make('configuration.endpoint')
-                ->label(trans('admin/setting.backup.s3.endpoint'))
-                ->required(),
-            Toggle::make('configuration.use_path_style_endpoint')
-                ->label(trans('admin/setting.backup.s3.use_path_style_endpoint'))
-                ->inline(false)
-                ->onIcon(TablerIcon::Check)
-                ->offIcon(TablerIcon::X)
-                ->onColor('success')
-                ->offColor('danger')
-                ->live()
-                ->stateCast(new BooleanStateCast(false)),
-        ];
-    }
-
-    /** @return array{parts: string[], part_size: int} */
-    public function getUploadParts(Backup $backup, int $size): array
-    {
-        $expires = CarbonImmutable::now()->addMinutes(config('backups.presigned_url_lifespan', 60));
-
-        // Params for generating the presigned urls
-        $params = [
-            'Bucket' => $backup->backupHost->configuration['bucket'],
-            'Key' => "{$backup->server->uuid}/$backup->uuid.tar.gz",
-            'ContentType' => 'application/x-gzip',
-        ];
-
-        $storageClass = $backup->backupHost->configuration['storage_class'];
-        if (!is_null($storageClass)) {
-            $params['StorageClass'] = $storageClass;
-        }
-
-        $client = $this->createClient($backup->backupHost);
-
-        // Execute the CreateMultipartUpload request
-        $result = $client->execute($client->getCommand('CreateMultipartUpload', $params));
-
-        // Get the UploadId from the CreateMultipartUpload request, this is needed to create
-        // the other presigned urls.
-        $params['UploadId'] = $result->get('UploadId');
-
-        // Retrieve configured part size
-        $maxPartSize = config('backups.max_part_size', BackupRemoteUploadController::DEFAULT_MAX_PART_SIZE);
-        if ($maxPartSize <= 0) {
-            $maxPartSize = BackupRemoteUploadController::DEFAULT_MAX_PART_SIZE;
-        }
-
-        // Create as many UploadPart presigned urls as needed
-        $parts = [];
-        for ($i = 0; $i < ($size / $maxPartSize); $i++) {
-            $parts[] = $client->createPresignedRequest(
-                $client->getCommand('UploadPart', array_merge($params, ['PartNumber' => $i + 1])),
-                $expires
-            )->getUri()->__toString();
-        }
-
-        // Set the upload_id on the backup in the database.
-        $backup->update(['upload_id' => $params['UploadId']]);
-
-        return [
-            'parts' => $parts,
-            'part_size' => $maxPartSize,
-        ];
-    }
-
-    /**
-     * Marks a multipart upload in a given S3-compatible instance as failed or successful for the given backup.
-     *
-     * @param  ?array<array{int, etag: string, part_number: string}>  $parts
-     *
-     * @throws Exception
-     */
-    public function completeMultipartUpload(Backup $backup, bool $successful, ?array $parts): void
-    {
-        // This should never really happen, but if it does don't let us fall victim to Amazon's
-        // wildly fun error messaging. Just stop the process right here.
-        if (empty($backup->upload_id)) {
-            // A failed backup doesn't need to error here, this can happen if the backup encounters
-            // an error before we even start the upload. AWS gives you tooling to clear these failed
-            // multipart uploads as needed too.
-            if (!$successful) {
-                return;
-            }
-
-            throw new Exception('Cannot complete backup request: no upload_id present on model.');
-        }
-
-        $params = [
-            'Bucket' => $backup->backupHost->configuration['bucket'],
-            'Key' => "{$backup->server->uuid}/$backup->uuid.tar.gz",
-            'UploadId' => $backup->upload_id,
-        ];
-
-        $client = $this->createClient($backup->backupHost);
-
-        if (!$successful) {
-            $client->execute($client->getCommand('AbortMultipartUpload', $params));
-
-            return;
-        }
-
-        // Otherwise send a CompleteMultipartUpload request.
-        $params['MultipartUpload'] = [
-            'Parts' => [],
-        ];
-
-        if (is_null($parts)) {
-            $params['MultipartUpload']['Parts'] = $client->execute($client->getCommand('ListParts', $params))['Parts'];
-        } else {
-            foreach ($parts as $part) {
-                $params['MultipartUpload']['Parts'][] = [
-                    'ETag' => $part['etag'],
-                    'PartNumber' => $part['part_number'],
-                ];
-            }
-        }
-
-        $client->execute($client->getCommand('CompleteMultipartUpload', $params));
-    }
-}

app/Extensions/BackupAdapter/Schemas/WingsBackupSchema.php

@@ -1,64 +0,0 @@
-<?php
-
-namespace App\Extensions\BackupAdapter\Schemas;
-
-use App\Models\Backup;
-use App\Models\User;
-use App\Repositories\Daemon\DaemonBackupRepository;
-use App\Services\Nodes\NodeJWTService;
-use Carbon\CarbonImmutable;
-use Exception;
-use Filament\Infolists\Components\TextEntry;
-use Filament\Schemas\Components\Component;
-use Illuminate\Http\Response;
-
-final class WingsBackupSchema extends BackupAdapterSchema
-{
-    public function __construct(private readonly DaemonBackupRepository $repository, private readonly NodeJWTService $jwtService) {}
-
-    public function getId(): string
-    {
-        return 'wings';
-    }
-
-    public function createBackup(Backup $backup): void
-    {
-        $this->repository->setServer($backup->server)->create($backup);
-    }
-
-    /** @throws Exception */
-    public function deleteBackup(Backup $backup): void
-    {
-        try {
-            $this->repository->setServer($backup->server)->delete($backup);
-        } catch (Exception $exception) {
-            // Don't fail the request if the Daemon responds with a 404, just assume the backup
-            // doesn't actually exist and remove its reference from the Panel as well.
-            if ($exception->getCode() !== Response::HTTP_NOT_FOUND) {
-                throw $exception;
-            }
-        }
-    }
-
-    public function getDownloadLink(Backup $backup, User $user): string
-    {
-        $token = $this->jwtService
-            ->setExpiresAt(CarbonImmutable::now()->addMinutes(15))
-            ->setUser($user)
-            ->setClaims([
-                'backup_uuid' => $backup->uuid,
-                'server_uuid' => $backup->server->uuid,
-            ])
-            ->handle($backup->server->node, $user->id . $backup->server->uuid);
-
-        return $backup->server->node->getConnectionAddress() . '/download/backup?token=' . $token->toString();
-    }
-
-    /** @return Component[] */
-    public function getConfigurationForm(): array
-    {
-        return [
-            TextEntry::make(trans('admin/backuphost.no_configuration')),
-        ];
-    }
-}

app/Extensions/Backups/BackupManager.php

@@ -0,0 +1,177 @@
+<?php
+
+namespace App\Extensions\Backups;
+
+use App\Extensions\Filesystem\S3Filesystem;
+use Aws\S3\S3Client;
+use Closure;
+use Illuminate\Foundation\Application;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
+use InvalidArgumentException;
+use League\Flysystem\FilesystemAdapter;
+use League\Flysystem\InMemory\InMemoryFilesystemAdapter;
+use Webmozart\Assert\Assert;
+
+class BackupManager
+{
+    /**
+     * The array of resolved backup drivers.
+     *
+     * @var array<string, FilesystemAdapter>
+     */
+    protected array $adapters = [];
+
+    /**
+     * The registered custom driver creators.
+     *
+     * @var array<string, callable>
+     */
+    protected array $customCreators;
+
+    public function __construct(protected Application $app) {}
+
+    /**
+     * Returns a backup adapter instance.
+     */
+    public function adapter(?string $name = null): FilesystemAdapter
+    {
+        return $this->get($name ?: $this->getDefaultAdapter());
+    }
+
+    /**
+     * Set the given backup adapter instance.
+     */
+    public function set(string $name, FilesystemAdapter $disk): self
+    {
+        $this->adapters[$name] = $disk;
+
+        return $this;
+    }
+
+    /**
+     * Gets a backup adapter.
+     */
+    protected function get(string $name): FilesystemAdapter
+    {
+        return $this->adapters[$name] = $this->resolve($name);
+    }
+
+    /**
+     * Resolve the given backup disk.
+     */
+    protected function resolve(string $name): FilesystemAdapter
+    {
+        $config = $this->getConfig($name);
+
+        if (empty($config['adapter'])) {
+            throw new InvalidArgumentException("Backup disk [$name] does not have a configured adapter.");
+        }
+
+        $adapter = $config['adapter'];
+
+        if (isset($this->customCreators[$name])) {
+            return $this->callCustomCreator($config);
+        }
+
+        $adapterMethod = 'create' . Str::studly($adapter) . 'Adapter';
+        if (method_exists($this, $adapterMethod)) {
+            $instance = $this->{$adapterMethod}($config);
+
+            Assert::isInstanceOf($instance, FilesystemAdapter::class);
+
+            return $instance;
+        }
+
+        throw new InvalidArgumentException("Adapter [$adapter] is not supported.");
+    }
+
+    /**
+     * Calls a custom creator for a given adapter type.
+     *
+     * @param  array{adapter: string}  $config
+     */
+    protected function callCustomCreator(array $config): mixed
+    {
+        return $this->customCreators[$config['adapter']]($this->app, $config);
+    }
+
+    /**
+     * Creates a new daemon adapter.
+     *
+     * @param  array<string, string>  $config
+     */
+    public function createWingsAdapter(array $config): FilesystemAdapter
+    {
+        return new InMemoryFilesystemAdapter();
+    }
+
+    /**
+     * Creates a new S3 adapter.
+     *
+     * @param  array<string, string>  $config
+     */
+    public function createS3Adapter(array $config): FilesystemAdapter
+    {
+        $config['version'] = 'latest';
+
+        if (!empty($config['key']) && !empty($config['secret'])) {
+            $config['credentials'] = Arr::only($config, ['key', 'secret', 'token']);
+        }
+
+        $client = new S3Client($config);
+
+        return new S3Filesystem($client, $config['bucket'], $config['prefix'] ?? '', $config['options'] ?? []);
+    }
+
+    /**
+     * Returns the configuration associated with a given backup type.
+     *
+     * @return array<mixed>
+     */
+    protected function getConfig(string $name): array
+    {
+        return config("backups.disks.$name") ?: [];
+    }
+
+    /**
+     * Get the default backup driver name.
+     */
+    public function getDefaultAdapter(): string
+    {
+        return config('backups.default');
+    }
+
+    /**
+     * Set the default session driver name.
+     */
+    public function setDefaultAdapter(string $name): void
+    {
+        config()->set('backups.default', $name);
+    }
+
+    /**
+     * Unset the given adapter instances.
+     *
+     * @param  string|string[]  $adapter
+     */
+    public function forget(array|string $adapter): self
+    {
+        $adapters = &$this->adapters;
+        foreach ((array) $adapter as $adapterName) {
+            unset($adapters[$adapterName]);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Register a custom adapter creator closure.
+     */
+    public function extend(string $adapter, Closure $callback): self
+    {
+        $this->customCreators[$adapter] = $callback;
+
+        return $this;
+    }
+}

app/Extensions/Filesystem/S3Filesystem.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Extensions\Filesystem;
+
+use Aws\S3\S3ClientInterface;
+use League\Flysystem\AwsS3V3\AwsS3V3Adapter;
+
+class S3Filesystem extends AwsS3V3Adapter
+{
+    /**
+     * @param  array<mixed>  $options
+     */
+    public function __construct(
+        private S3ClientInterface $client,
+        private string $bucket,
+        string $prefix = '',
+        array $options = [],
+    ) {
+        parent::__construct(
+            $client,
+            $bucket,
+            $prefix,
+            null,
+            null,
+            $options,
+        );
+    }
+
+    public function getClient(): S3ClientInterface
+    {
+        return $this->client;
+    }
+
+    public function getBucket(): string
+    {
+        return $this->bucket;
+    }
+}

app/Extensions/Tasks/Schemas/CreateBackupSchema.php

@@ -8,7 +8,7 @@ use App\Services\Backups\InitiateBackupService;
 
 final class CreateBackupSchema extends TaskSchema
 {
-    public function __construct(private InitiateBackupService $initiateService) {}
+    public function __construct(private InitiateBackupService $backupService) {}
 
     public function getId(): string
     {
@@ -17,7 +17,7 @@ final class CreateBackupSchema extends TaskSchema
 
     public function runTask(Task $task): void
     {
-        $this->initiateService->setIgnoredFiles(explode(PHP_EOL, $task->payload))->handle($task->server, null, true);
+        $this->backupService->setIgnoredFiles(explode(PHP_EOL, $task->payload))->handle($task->server, null, true);
     }
 
     public function canCreate(Schedule $schedule): bool

app/Filament/Admin/Pages/ListLogs.php

@@ -14,14 +14,13 @@ use Boquizo\FilamentLogViewer\Utils\Level;
 use Filament\Actions\Action;
 use Filament\Notifications\Notification;
 use Filament\Tables\Table;
-use Illuminate\Contracts\Support\Htmlable;
 use Illuminate\Support\Facades\Http;
 
 class ListLogs extends BaseListLogs
 {
     protected string $view = 'filament.components.list-logs';
 
-    public function getHeading(): string|null|Htmlable
+    public function getHeading(): string|null|\Illuminate\Contracts\Support\Htmlable
     {
         return trans('admin/log.navigation.panel_logs');
     }

app/Filament/Admin/Pages/Settings.php

@@ -6,14 +6,13 @@ use App\Enums\TablerIcon;
 use App\Extensions\Avatar\AvatarService;
 use App\Extensions\Captcha\CaptchaService;
 use App\Extensions\OAuth\OAuthService;
+use App\Models\Backup;
 use App\Notifications\MailTested;
 use App\Traits\EnvironmentWriterTrait;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use App\Traits\Filament\CanCustomizeTabs;
 use BackedEnum;
-use BladeUI\Icons\Exceptions\SvgNotFound;
-use BladeUI\Icons\Factory as IconFactory;
 use Exception;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
@@ -69,8 +68,6 @@ class Settings extends Page implements HasSchemas
 
     protected CaptchaService $captchaService;
 
-    protected IconFactory $iconFactory;
-
     /** @var array<mixed>|null */
     public ?array $data = [];
 
@@ -79,12 +76,11 @@ class Settings extends Page implements HasSchemas
         $this->form->fill();
     }
 
-    public function boot(OAuthService $oauthService, AvatarService $avatarService, CaptchaService $captchaService, IconFactory $iconFactory): void
+    public function boot(OAuthService $oauthService, AvatarService $avatarService, CaptchaService $captchaService): void
     {
         $this->oauthService = $oauthService;
         $this->avatarService = $avatarService;
         $this->captchaService = $captchaService;
-        $this->iconFactory = $iconFactory;
     }
 
     public static function canAccess(): bool
@@ -489,6 +485,16 @@ class Settings extends Page implements HasSchemas
     private function backupSettings(): array
     {
         return [
+            ToggleButtons::make('APP_BACKUP_DRIVER')
+                ->label(trans('admin/setting.backup.backup_driver'))
+                ->columnSpanFull()
+                ->inline()
+                ->options([
+                    Backup::ADAPTER_DAEMON => 'Wings',
+                    Backup::ADAPTER_AWS_S3 => 'S3',
+                ])
+                ->live()
+                ->default(env('APP_BACKUP_DRIVER', config('backups.default'))),
             Section::make(trans('admin/setting.backup.throttle'))
                 ->description(trans('admin/setting.backup.throttle_help'))
                 ->columns()
@@ -508,6 +514,41 @@ class Settings extends Page implements HasSchemas
                         ->suffix('Seconds')
                         ->default(config('backups.throttles.period')),
                 ]),
+            Section::make(trans('admin/setting.backup.s3.s3_title'))
+                ->columns()
+                ->visible(fn (Get $get) => $get('APP_BACKUP_DRIVER') === Backup::ADAPTER_AWS_S3)
+                ->schema([
+                    TextInput::make('AWS_DEFAULT_REGION')
+                        ->label(trans('admin/setting.backup.s3.default_region'))
+                        ->required()
+                        ->default(config('backups.disks.s3.region')),
+                    TextInput::make('AWS_ACCESS_KEY_ID')
+                        ->label(trans('admin/setting.backup.s3.access_key'))
+                        ->required()
+                        ->default(config('backups.disks.s3.key')),
+                    TextInput::make('AWS_SECRET_ACCESS_KEY')
+                        ->label(trans('admin/setting.backup.s3.secret_key'))
+                        ->required()
+                        ->default(config('backups.disks.s3.secret')),
+                    TextInput::make('AWS_BACKUPS_BUCKET')
+                        ->label(trans('admin/setting.backup.s3.bucket'))
+                        ->required()
+                        ->default(config('backups.disks.s3.bucket')),
+                    TextInput::make('AWS_ENDPOINT')
+                        ->label(trans('admin/setting.backup.s3.endpoint'))
+                        ->required()
+                        ->default(config('backups.disks.s3.endpoint')),
+                    Toggle::make('AWS_USE_PATH_STYLE_ENDPOINT')
+                        ->label(trans('admin/setting.backup.s3.use_path_style_endpoint'))
+                        ->inline(false)
+                        ->onIcon(TablerIcon::Check)
+                        ->offIcon(TablerIcon::X)
+                        ->onColor('success')
+                        ->offColor('danger')
+                        ->live()
+                        ->stateCast(new BooleanStateCast(false))
+                        ->default(env('AWS_USE_PATH_STYLE_ENDPOINT', config('backups.disks.s3.use_path_style_endpoint'))),
+                ]),
         ];
     }
 
@@ -524,18 +565,9 @@ class Settings extends Page implements HasSchemas
         foreach ($oauthSchemas as $schema) {
             $key = $schema->getConfigKey();
 
-            $icon = $schema->getIcon();
-            if (is_string($icon)) {
-                try {
-                    $this->iconFactory->svg($icon);
-                } catch (SvgNotFound) {
-                    $icon = null;
-                }
-            }
-
             $formFields[] = Section::make($schema->getName())
                 ->columns(5)
-                ->icon($icon ?? TablerIcon::BrandOauth)
+                ->icon($schema->getIcon() ?? TablerIcon::BrandOauth)
                 ->collapsed(fn () => !$schema->isEnabled())
                 ->collapsible()
                 ->schema([

app/Filament/Admin/Resources/ApiKeys/ApiKeyResource.php

@@ -22,7 +22,6 @@ use Filament\Forms\Components\ToggleButtons;
 use Filament\Resources\Pages\PageRegistration;
 use Filament\Resources\Resource;
 use Filament\Schemas\Components\Fieldset;
-use Filament\Schemas\Components\Section;
 use Filament\Schemas\Schema;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
@@ -114,44 +113,12 @@ class ApiKeyResource extends Resource
      */
     public static function defaultForm(Schema $schema): Schema
     {
-        $permissionList = ApiKey::getPermissionList();
-
         return $schema
             ->components([
-                Section::make(trans('admin/apikey.permissions.all'))
-                    ->description(trans('admin/apikey.permissions.all_description'))
-                    ->columnSpanFull()
-                    ->schema([
-                        ToggleButtons::make('permissions_all')
-                            ->hiddenLabel()
-                            ->inline()
-                            ->options([
-                                0 => trans('admin/apikey.permissions.none'),
-                                1 => trans('admin/apikey.permissions.read'),
-                                3 => trans('admin/apikey.permissions.read_write'),
-                            ])
-                            ->icons([
-                                0 => TablerIcon::BookOff,
-                                1 => TablerIcon::Book,
-                                3 => TablerIcon::Writing,
-                            ])
-                            ->colors([
-                                0 => 'success',
-                                1 => 'warning',
-                                3 => 'danger',
-                            ])
-                            ->live()
-                            ->afterStateUpdated(function ($state, callable $set) use ($permissionList) {
-                                foreach ($permissionList as $resource) {
-                                    $set('permissions_' . $resource, $state);
-                                }
-                            })
-                            ->default(0),
-                    ]),
                 Fieldset::make('Permissions')
                     ->columnSpanFull()
                     ->schema(
-                        collect($permissionList)->map(fn ($resource) => ToggleButtons::make('permissions_' . $resource)
+                        collect(ApiKey::getPermissionList())->map(fn ($resource) => ToggleButtons::make('permissions_' . $resource)
                             ->label(str($resource)->replace('_', ' ')->title())->inline()
                             ->options([
                                 0 => trans('admin/apikey.permissions.none'),

app/Filament/Admin/Resources/BackupHosts/BackupHostResource.php

@@ -1,162 +0,0 @@
-<?php
-
-namespace App\Filament\Admin\Resources\BackupHosts;
-
-use App\Enums\TablerIcon;
-use App\Extensions\BackupAdapter\BackupAdapterService;
-use App\Filament\Admin\Resources\BackupHosts\Pages\CreateBackupHost;
-use App\Filament\Admin\Resources\BackupHosts\Pages\EditBackupHost;
-use App\Filament\Admin\Resources\BackupHosts\Pages\ListBackupHosts;
-use App\Filament\Admin\Resources\BackupHosts\Pages\ViewBackupHost;
-use App\Filament\Admin\Resources\BackupHosts\RelationManagers\BackupsRelationManager;
-use App\Models\BackupHost;
-use App\Traits\Filament\CanCustomizePages;
-use App\Traits\Filament\CanCustomizeRelations;
-use App\Traits\Filament\CanModifyForm;
-use App\Traits\Filament\CanModifyTable;
-use BackedEnum;
-use Exception;
-use Filament\Actions\CreateAction;
-use Filament\Actions\EditAction;
-use Filament\Actions\ViewAction;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\TextInput;
-use Filament\Resources\Pages\PageRegistration;
-use Filament\Resources\RelationManagers\RelationManager;
-use Filament\Resources\Resource;
-use Filament\Schemas\Components\Section;
-use Filament\Schemas\Components\Utilities\Get;
-use Filament\Schemas\Schema;
-use Filament\Tables\Columns\TextColumn;
-use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-
-class BackupHostResource extends Resource
-{
-    use CanCustomizePages;
-    use CanCustomizeRelations;
-    use CanModifyForm;
-    use CanModifyTable;
-
-    protected static ?string $model = BackupHost::class;
-
-    protected static string|BackedEnum|null $navigationIcon = TablerIcon::FileZip;
-
-    protected static ?string $recordTitleAttribute = 'name';
-
-    public static function getNavigationBadge(): ?string
-    {
-        return (string) static::getEloquentQuery()->count() ?: null;
-    }
-
-    public static function getNavigationLabel(): string
-    {
-        return static::getPluralModelLabel();
-    }
-
-    public static function getModelLabel(): string
-    {
-        return trans_choice('admin/backuphost.model_label', 1);
-    }
-
-    public static function getPluralModelLabel(): string
-    {
-        return trans_choice('admin/backuphost.model_label', 2);
-    }
-
-    public static function getNavigationGroup(): ?string
-    {
-        return trans('admin/dashboard.advanced');
-    }
-
-    /** @throws Exception */
-    public static function defaultTable(Table $table): Table
-    {
-        return $table
-            ->columns([
-                TextColumn::make('name')
-                    ->label(trans('admin/backuphost.name')),
-                TextColumn::make('schema')
-                    ->label(trans('admin/backuphost.schema'))
-                    ->badge(),
-                TextColumn::make('backups_count')
-                    ->counts('backups')
-                    ->label(trans('admin/backuphost.backups')),
-                TextColumn::make('nodes.name')
-                    ->badge()
-                    ->placeholder(trans('admin/backuphost.all_nodes')),
-            ])
-            ->recordActions([
-                ViewAction::make()
-                    ->hidden(fn ($record) => static::getEditAuthorizationResponse($record)->allowed()),
-                EditAction::make(),
-            ])
-            ->toolbarActions([
-                CreateAction::make(),
-            ])
-            ->emptyStateIcon(TablerIcon::FileZip)
-            ->emptyStateDescription(trans('admin/backuphost.local_backups_only'))
-            ->emptyStateHeading(trans('admin/backuphost.no_backup_hosts'));
-    }
-
-    /** @throws Exception */
-    public static function defaultForm(Schema $schema): Schema
-    {
-        return $schema
-            ->components([
-                TextInput::make('name')
-                    ->label(trans('admin/backuphost.name'))
-                    ->required(),
-                Select::make('schema')
-                    ->label(trans('admin/backuphost.schema'))
-                    ->required()
-                    ->selectablePlaceholder(false)
-                    ->searchable()
-                    ->options(fn (BackupAdapterService $service) => $service->getMappings())
-                    ->live(onBlur: true),
-                Select::make('node_ids')
-                    ->label(trans('admin/backuphost.linked_nodes'))
-                    ->multiple()
-                    ->searchable()
-                    ->preload()
-                    ->relationship('nodes', 'name', fn (Builder $query) => $query->whereIn('nodes.id', user()?->accessibleNodes()->pluck('id'))),
-                Section::make(trans('admin/backuphost.configuration'))
-                    ->columnSpanFull()
-                    ->columns()
-                    ->schema(function (?BackupHost $backupHost, Get $get, BackupAdapterService $service) {
-                        $schema = $get('schema') ?? $backupHost?->schema;
-
-                        if (!$schema) {
-                            return [];
-                        }
-
-                        $schema = $service->get($schema);
-
-                        if ($schema) {
-                            return $schema->getConfigurationForm();
-                        }
-
-                        return [];
-                    }),
-            ]);
-    }
-
-    /** @return class-string<RelationManager>[] */
-    public static function getDefaultRelations(): array
-    {
-        return [
-            BackupsRelationManager::class,
-        ];
-    }
-
-    /** @return array<string, PageRegistration> */
-    public static function getDefaultPages(): array
-    {
-        return [
-            'index' => ListBackupHosts::route('/'),
-            'create' => CreateBackupHost::route('/create'),
-            'view' => ViewBackupHost::route('/{record}'),
-            'edit' => EditBackupHost::route('/{record}/edit'),
-        ];
-    }
-}

app/Filament/Admin/Resources/BackupHosts/Pages/CreateBackupHost.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Filament\Admin\Resources\BackupHosts\Pages;
-
-use App\Filament\Admin\Resources\BackupHosts\BackupHostResource;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use Filament\Resources\Pages\CreateRecord;
-
-class CreateBackupHost extends CreateRecord
-{
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
-
-    protected static string $resource = BackupHostResource::class;
-
-    protected static bool $canCreateAnother = false;
-}

app/Filament/Admin/Resources/BackupHosts/Pages/EditBackupHost.php

@@ -1,43 +0,0 @@
-<?php
-
-namespace App\Filament\Admin\Resources\BackupHosts\Pages;
-
-use App\Enums\TablerIcon;
-use App\Filament\Admin\Resources\BackupHosts\BackupHostResource;
-use App\Models\BackupHost;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use Filament\Actions\Action;
-use Filament\Actions\ActionGroup;
-use Filament\Actions\DeleteAction;
-use Filament\Resources\Pages\EditRecord;
-
-class EditBackupHost extends EditRecord
-{
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
-
-    protected static string $resource = BackupHostResource::class;
-
-    /** @return array<Action|ActionGroup> */
-    protected function getDefaultHeaderActions(): array
-    {
-        return [
-            DeleteAction::make()
-                ->label(fn (BackupHost $backupHost) => $backupHost->backups()->count() > 0 ? trans('admin/backuphost.delete_help') : trans('filament-actions::delete.single.modal.actions.delete.label'))
-                ->disabled(fn (BackupHost $backupHost) => $backupHost->backups()->count() > 0)
-                ->hidden(fn () => BackupHost::count() === 1),
-            Action::make('save')
-                ->hiddenLabel()
-                ->action('save')
-                ->keyBindings(['mod+s'])
-                ->tooltip(trans('filament-panels::resources/pages/edit-record.form.actions.save.label'))
-                ->icon(TablerIcon::DeviceFloppy),
-        ];
-    }
-
-    protected function getFormActions(): array
-    {
-        return [];
-    }
-}

app/Filament/Admin/Resources/BackupHosts/Pages/ListBackupHosts.php

@@ -1,16 +0,0 @@
-<?php
-
-namespace App\Filament\Admin\Resources\BackupHosts\Pages;
-
-use App\Filament\Admin\Resources\BackupHosts\BackupHostResource;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use Filament\Resources\Pages\ListRecords;
-
-class ListBackupHosts extends ListRecords
-{
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
-
-    protected static string $resource = BackupHostResource::class;
-}

app/Filament/Admin/Resources/BackupHosts/Pages/ViewBackupHost.php

@@ -1,27 +0,0 @@
-<?php
-
-namespace App\Filament\Admin\Resources\BackupHosts\Pages;
-
-use App\Filament\Admin\Resources\BackupHosts\BackupHostResource;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use Filament\Actions\Action;
-use Filament\Actions\ActionGroup;
-use Filament\Actions\EditAction;
-use Filament\Resources\Pages\ViewRecord;
-
-class ViewBackupHost extends ViewRecord
-{
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
-
-    protected static string $resource = BackupHostResource::class;
-
-    /** @return array<Action|ActionGroup> */
-    protected function getDefaultHeaderActions(): array
-    {
-        return [
-            EditAction::make(),
-        ];
-    }
-}

app/Filament/Admin/Resources/BackupHosts/RelationManagers/BackupsRelationManager.php

@@ -1,42 +0,0 @@
-<?php
-
-namespace App\Filament\Admin\Resources\BackupHosts\RelationManagers;
-
-use App\Enums\TablerIcon;
-use App\Filament\Components\Tables\Columns\BytesColumn;
-use App\Filament\Components\Tables\Columns\DateTimeColumn;
-use Filament\Resources\RelationManagers\RelationManager;
-use Filament\Tables\Columns\IconColumn;
-use Filament\Tables\Columns\TextColumn;
-use Filament\Tables\Table;
-
-class BackupsRelationManager extends RelationManager
-{
-    protected static string $relationship = 'backups';
-
-    public function table(Table $table): Table
-    {
-        return $table
-            ->recordTitleAttribute('name')
-            ->heading(null)
-            ->columns([
-                TextColumn::make('name')
-                    ->label(trans('server/backup.actions.create.name'))
-                    ->searchable(),
-                BytesColumn::make('bytes')
-                    ->label(trans('server/backup.size')),
-                DateTimeColumn::make('created_at')
-                    ->label(trans('server/backup.created_at'))
-                    ->since()
-                    ->sortable(),
-                TextColumn::make('status')
-                    ->label(trans('server/backup.status'))
-                    ->badge(),
-                IconColumn::make('is_locked')
-                    ->label(trans('server/backup.is_locked'))
-                    ->visibleFrom('md')
-                    ->trueIcon(TablerIcon::Lock)
-                    ->falseIcon(TablerIcon::LockOpen),
-            ]);
-    }
-}

app/Filament/Admin/Resources/DatabaseHosts/DatabaseHostResource.php

@@ -101,7 +101,7 @@ class DatabaseHostResource extends Resource
             ->toolbarActions([
                 CreateAction::make(),
                 BulkActionGroup::make([
-                    DeleteBulkAction::make('exclude_bulk_delete'),
+                    DeleteBulkAction::make(),
                 ]),
             ])
             ->emptyStateIcon(TablerIcon::Database)

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

@@ -8,7 +8,6 @@ use App\Services\Databases\Hosts\HostCreationService;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Exception;
-use Filament\Actions\Action;
 use Filament\Forms\Components\Hidden;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
@@ -46,17 +45,6 @@ class CreateDatabaseHost extends CreateRecord
         $this->service = $service;
     }
 
-    protected function getCreateFormAction(): Action
-    {
-        $hasFormWrapper = $this->hasFormWrapper();
-
-        return Action::make('exclude_create')
-            ->label(trans('filament-panels::resources/pages/create-record.form.actions.create.label'))
-            ->submit($hasFormWrapper ? $this->getSubmitFormLivewireMethodName() : null)
-            ->action($hasFormWrapper ? null : $this->getSubmitFormLivewireMethodName())
-            ->keyBindings(['mod+s']);
-    }
-
     /** @return Step[]
      * @throws Exception
      */

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

@@ -175,8 +175,7 @@ class CreateEgg extends CreateRecord
                         ->addActionLabel(trans('admin/egg.add_new_variable'))
                         ->grid()
                         ->relationship('variables')
-                        ->orderColumn()
-                        ->reorderAction(fn (Action $action) => $action->hiddenLabel()->tooltip(fn () => $action->getLabel()))
+                        ->reorderable()->orderColumn()
                         ->collapsible()->collapsed()
                         ->columnSpan(2)
                         ->defaultItems(0)

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

@@ -5,10 +5,8 @@ namespace App\Filament\Admin\Resources\Eggs\Pages;
 use App\Enums\EditorLanguages;
 use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\Eggs\EggResource;
-use App\Filament\Components\Actions\DeleteIcon;
 use App\Filament\Components\Actions\ExportEggAction;
 use App\Filament\Components\Actions\ImportEggAction;
-use App\Filament\Components\Actions\UploadIcon;
 use App\Filament\Components\Forms\Fields\CopyFrom;
 use App\Filament\Components\Forms\Fields\MonacoEditor;
 use App\Models\Egg;
@@ -16,10 +14,12 @@ use App\Models\EggVariable;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use App\Traits\Filament\CanCustomizeTabs;
+use Exception;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Actions\DeleteAction;
 use Filament\Forms\Components\Checkbox;
+use Filament\Forms\Components\FileUpload;
 use Filament\Forms\Components\Hidden;
 use Filament\Forms\Components\KeyValue;
 use Filament\Forms\Components\Repeater;
@@ -28,8 +28,11 @@ use Filament\Forms\Components\TagsInput;
 use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Toggle;
+use Filament\Infolists\Components\TextEntry;
+use Filament\Notifications\Notification;
 use Filament\Resources\Pages\EditRecord;
 use Filament\Schemas\Components\Fieldset;
+use Filament\Schemas\Components\Flex;
 use Filament\Schemas\Components\Grid;
 use Filament\Schemas\Components\Image;
 use Filament\Schemas\Components\Tabs;
@@ -37,7 +40,10 @@ use Filament\Schemas\Components\Tabs\Tab;
 use Filament\Schemas\Components\Utilities\Get;
 use Filament\Schemas\Components\Utilities\Set;
 use Filament\Schemas\Schema;
+use Filament\Support\Enums\IconSize;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Validation\Rules\Unique;
+use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
 
 class EditEgg extends EditRecord
 {
@@ -68,17 +74,163 @@ class EditEgg extends EditRecord
                 ->icon(TablerIcon::Egg)
                 ->schema([
                     Grid::make(2)
-                        ->columnStart(1)
+                        ->columnSpan(1)
                         ->schema([
-                            Image::make('', 'icon')
-                                ->hidden(fn ($record) => !$record->icon)
-                                ->url(fn ($record) => $record->icon)
+                            Image::make('', '')
+                                ->hidden(fn ($record) => !$record->image)
+                                ->url(fn ($record) => $record->image)
+                                ->alt('')
+                                ->alignJustify()
                                 ->imageSize(150)
-                                ->columnSpanFull()
-                                ->alignJustify(),
-                            UploadIcon::make(),
-                            DeleteIcon::make()
-                                ->iconStoragePath(Egg::getIconStoragePath()),
+                                ->columnSpanFull(),
+                            Flex::make([
+                                Action::make('uploadImage')
+                                    ->hiddenLabel()
+                                    ->tooltip(trans('admin/egg.import.import_image'))
+                                    ->iconSize(IconSize::Large)
+                                    ->icon(TablerIcon::PhotoUp)
+                                    ->modal()
+                                    ->modalHeading('')
+                                    ->modalSubmitActionLabel(trans('admin/egg.import.import_image'))
+                                    ->schema([
+                                        Tabs::make()
+                                            ->contained(false)
+                                            ->tabs([
+                                                Tab::make(trans('admin/egg.import.url'))
+                                                    ->schema([
+                                                        Hidden::make('imageUrl'),
+                                                        Hidden::make('imageExtension'),
+                                                        TextInput::make('image_url')
+                                                            ->label(trans('admin/egg.import.image_url'))
+                                                            ->reactive()
+                                                            ->autocomplete(false)
+                                                            ->debounce(500)
+                                                            ->afterStateUpdated(function ($state, Set $set) {
+                                                                if (!$state) {
+                                                                    $set('image_url_error', null);
+                                                                    $set('imageUrl', null);
+                                                                    $set('imageExtension', null);
+
+                                                                    return;
+                                                                }
+
+                                                                try {
+                                                                    if (!filter_var($state, FILTER_VALIDATE_URL)) {
+                                                                        throw new Exception(trans('admin/egg.import.invalid_url'));
+                                                                    }
+
+                                                                    $extension = strtolower(pathinfo(parse_url($state, PHP_URL_PATH), PATHINFO_EXTENSION));
+
+                                                                    if (!array_key_exists($extension, Egg::IMAGE_FORMATS)) {
+                                                                        throw new Exception(trans('admin/egg.import.unsupported_format', ['format' => implode(', ', array_keys(Egg::IMAGE_FORMATS))]));
+                                                                    }
+
+                                                                    $host = parse_url($state, PHP_URL_HOST);
+                                                                    $ip = gethostbyname($host);
+
+                                                                    if (
+                                                                        filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE) === false
+                                                                    ) {
+                                                                        throw new Exception(trans('admin/egg.import.no_local_ip'));
+                                                                    }
+
+                                                                    $set('imageUrl', $state);
+                                                                    $set('imageExtension', $extension);
+                                                                    $set('image_url_error', null);
+
+                                                                } catch (Exception $e) {
+                                                                    $set('image_url_error', $e->getMessage());
+                                                                    $set('imageUrl', null);
+                                                                    $set('imageExtension', null);
+                                                                }
+                                                            }),
+                                                        TextEntry::make('image_url_error')
+                                                            ->hiddenLabel()
+                                                            ->visible(fn ($get) => $get('image_url_error') !== null)
+                                                            ->afterStateHydrated(fn ($set, $get) => $get('image_url_error')),
+                                                        Image::make(fn (Get $get) => $get('image_url'), '')
+                                                            ->imageSize(150)
+                                                            ->visible(fn ($get) => $get('image_url') && !$get('image_url_error'))
+                                                            ->alignCenter(),
+                                                    ]),
+                                                Tab::make(trans('admin/egg.import.file'))
+                                                    ->schema([
+                                                        FileUpload::make('image')
+                                                            ->hiddenLabel()
+                                                            ->previewable()
+                                                            ->openable(false)
+                                                            ->downloadable(false)
+                                                            ->maxSize(256)
+                                                            ->maxFiles(1)
+                                                            ->columnSpanFull()
+                                                            ->alignCenter()
+                                                            ->imageEditor()
+                                                            ->image()
+                                                            ->disk('public')
+                                                            ->directory(Egg::ICON_STORAGE_PATH)
+                                                            ->acceptedFileTypes([
+                                                                'image/png',
+                                                                'image/jpeg',
+                                                                'image/webp',
+                                                                'image/svg+xml',
+                                                            ])
+                                                            ->getUploadedFileNameForStorageUsing(function (TemporaryUploadedFile $file, $record) {
+                                                                return $record->uuid . '.' . $file->getClientOriginalExtension();
+                                                            }),
+                                                    ]),
+                                            ]),
+                                    ])
+                                    ->action(function (array $data, $record): void {
+                                        if (!empty($data['imageUrl']) && !empty($data['imageExtension'])) {
+                                            $this->saveImageFromUrl($data['imageUrl'], $data['imageExtension'], $record);
+
+                                            Notification::make()
+                                                ->title(trans('admin/egg.import.image_updated'))
+                                                ->success()
+                                                ->send();
+
+                                            return;
+                                        }
+
+                                        if (!empty($data['image'])) {
+                                            Notification::make()
+                                                ->title(trans('admin/egg.import.image_updated'))
+                                                ->success()
+                                                ->send();
+
+                                            return;
+                                        }
+
+                                        if (empty($data['imageUrl']) && empty($data['image'])) {
+                                            Notification::make()
+                                                ->title(trans('admin/egg.import.no_image'))
+                                                ->warning()
+                                                ->send();
+                                        }
+                                    }),
+                                Action::make('delete_image')
+                                    ->visible(fn ($record) => $record->image)
+                                    ->hiddenLabel()
+                                    ->tooltip(trans('admin/egg.import.delete_image'))
+                                    ->icon(TablerIcon::Trash)
+                                    ->iconSize(IconSize::Large)
+                                    ->color('danger')
+                                    ->action(function ($record) {
+                                        foreach (array_keys(Egg::IMAGE_FORMATS) as $ext) {
+                                            $path = Egg::ICON_STORAGE_PATH . "/$record->uuid.$ext";
+                                            if (Storage::disk('public')->exists($path)) {
+                                                Storage::disk('public')->delete($path);
+                                            }
+                                        }
+
+                                        Notification::make()
+                                            ->title(trans('admin/egg.import.image_deleted'))
+                                            ->success()
+                                            ->send();
+
+                                        $record->refresh();
+                                    }),
+                            ]),
                         ]),
                     TextInput::make('name')
                         ->label(trans('admin/egg.name'))
@@ -166,7 +318,6 @@ class EditEgg extends EditRecord
                         ->helperText(trans('admin/egg.start_config_help')),
                     Textarea::make('config_files')->rows(10)->json()
                         ->label(trans('admin/egg.config_files'))
-                        ->dehydrateStateUsing(fn ($state) => blank($state) ? '{}' : $state)
                         ->helperText(trans('admin/egg.config_files_help')),
                     Textarea::make('config_logs')->rows(10)->json()
                         ->label(trans('admin/egg.log_config'))
@@ -181,9 +332,9 @@ class EditEgg extends EditRecord
                         ->hiddenLabel()
                         ->grid()
                         ->relationship('variables')
-                        ->orderColumn()
-                        ->reorderAction(fn (Action $action) => $action->hiddenLabel()->tooltip(fn () => $action->getLabel()))
+                        ->reorderable()
                         ->collapsible()->collapsed()
+                        ->orderColumn()
                         ->addActionLabel(trans('admin/egg.add_new_variable'))
                         ->itemLabel(fn (array $state) => $state['name'])
                         ->mutateRelationshipDataBeforeCreateUsing(function (array $data): array {
@@ -299,7 +450,17 @@ class EditEgg extends EditRecord
         return [
             DeleteAction::make()
                 ->disabled(fn (Egg $egg): bool => $egg->servers()->count() > 0)
-                ->tooltip(fn (Egg $egg): string => $egg->servers()->count() <= 0 ? trans('filament-actions::delete.single.label') : trans('admin/egg.in_use')),
+                ->tooltip(fn (Egg $egg): string => $egg->servers()->count() <= 0 ? trans('filament-actions::delete.single.label') : trans('admin/egg.in_use'))
+                ->successNotification(fn (Egg $egg) => Notification::make()
+                    ->success()
+                    ->title(trans('admin/egg.delete_success'))
+                    ->body(trans('admin/egg.deleted', ['egg' => $egg->name]))
+                )
+                ->failureNotification(fn (Egg $egg) => Notification::make()
+                    ->danger()
+                    ->title(trans('admin/egg.delete_failed'))
+                    ->body(trans('admin/egg.could_not_delete', ['egg' => $egg->name]))
+                ),
             ExportEggAction::make(),
             ImportEggAction::make()
                 ->multiple(false),
@@ -317,6 +478,37 @@ class EditEgg extends EditRecord
         $this->fillForm();
     }
 
+    /**
+     * Save an image from URL download to a file.
+     *
+     * @throws Exception
+     */
+    private function saveImageFromUrl(string $imageUrl, string $extension, Egg $egg): void
+    {
+        $context = stream_context_create([
+            'http' => ['timeout' => 3],
+            'https' => [
+                'timeout' => 3,
+                'verify_peer' => true,
+                'verify_peer_name' => true,
+            ],
+        ]);
+
+        $data = @file_get_contents($imageUrl, false, $context, 0, 1048576); // 1024KB
+
+        if (empty($data)) {
+            throw new Exception(trans('admin/egg.import.invalid_url'));
+        }
+
+        $normalizedExtension = match ($extension) {
+            'svg+xml' => 'svg',
+            'jpeg' => 'jpg',
+            default => $extension,
+        };
+
+        Storage::disk('public')->put(Egg::ICON_STORAGE_PATH . "/$egg->uuid.$normalizedExtension", $data);
+    }
+
     protected function getFormActions(): array
     {
         return [];

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

@@ -38,8 +38,6 @@ class ListEggs extends ListRecords
      */
     public function table(Table $table): Table
     {
-        $defaultEggIcon = 'data:image/svg+xml;base64,' . base64_encode(file_get_contents(public_path('pelican.svg')));
-
         return $table
             ->searchable(true)
             ->defaultPaginationPageOption(25)
@@ -47,11 +45,13 @@ class ListEggs extends ListRecords
                 TextColumn::make('id')
                     ->label('Id')
                     ->hidden(),
-                ImageColumn::make('icon')
+                ImageColumn::make('image')
                     ->label('')
                     ->alignCenter()
                     ->circular()
-                    ->getStateUsing(fn (Egg $record) => $record->icon ?: $defaultEggIcon),
+                    ->getStateUsing(fn ($record) => $record->image
+                        ? $record->image
+                        : 'data:image/svg+xml;base64,' . base64_encode(file_get_contents(public_path('pelican.svg')))),
                 TextColumn::make('name')
                     ->label(trans('admin/egg.name'))
                     ->description(fn ($record): ?string => (strlen($record->description) > 120) ? substr($record->description, 0, 120).'...' : $record->description)
@@ -82,11 +82,11 @@ class ListEggs extends ListRecords
                     ->successRedirectUrl(fn (Egg $replica) => EditEgg::getUrl(['record' => $replica])),
             ])
             ->toolbarActions([
+                CreateAction::make(),
                 ImportEggAction::make()
                     ->multiple(),
-                CreateAction::make(),
                 BulkActionGroup::make([
-                    DeleteBulkAction::make('exclude_bulk_delete')
+                    DeleteBulkAction::make()
                         ->before(function (Collection &$records) {
                             $eggsWithServers = $records->filter(fn (Egg $egg) => $egg->servers_count > 0);
 
@@ -106,7 +106,7 @@ class ListEggs extends ListRecords
                                 $this->halt();
                             }
                         }),
-                    UpdateEggBulkAction::make('exclude_bulk_update')
+                    UpdateEggBulkAction::make()
                         ->before(function (Collection &$records) {
                             $eggsWithoutUpdateUrl = $records->filter(fn (Egg $egg) => $egg->update_url === null);
 

app/Filament/Admin/Resources/Mounts/MountResource.php

@@ -95,12 +95,6 @@ class MountResource extends Resource
                     ->icon(fn ($state) => $state ? TablerIcon::WritingOff : TablerIcon::Writing)
                     ->color(fn ($state) => $state ? 'success' : 'warning')
                     ->formatStateUsing(fn ($state) => $state ? trans('admin/mount.toggles.read_only') : trans('admin/mount.toggles.writable')),
-                TextColumn::make('user_mountable')
-                    ->label(trans('admin/mount.table.user_mountable'))
-                    ->badge()
-                    ->icon(fn ($state) => $state ? TablerIcon::User : TablerIcon::UserOff)
-                    ->color(fn ($state) => $state ? 'success' : 'warning')
-                    ->formatStateUsing(fn ($state) => $state ? trans('admin/mount.toggles.user_mountable') : trans('admin/mount.toggles.not_user_mountable')),
             ])
             ->recordActions([
                 ViewAction::make()
@@ -110,7 +104,7 @@ class MountResource extends Resource
             ->toolbarActions([
                 CreateAction::make(),
                 BulkActionGroup::make([
-                    DeleteBulkAction::make('exclude_bulk_delete'),
+                    DeleteBulkAction::make(),
                 ]),
             ])
             ->emptyStateIcon(TablerIcon::LayersLinked)
@@ -130,8 +124,7 @@ class MountResource extends Resource
                         ->label(trans('admin/mount.name'))
                         ->required()
                         ->helperText(trans('admin/mount.name_help'))
-                        ->maxLength(64)
-                        ->columnSpanFull(),
+                        ->maxLength(64),
                     ToggleButtons::make('read_only')
                         ->label(trans('admin/mount.read_only'))
                         ->helperText(trans('admin/mount.read_only_help'))
@@ -150,24 +143,6 @@ class MountResource extends Resource
                         ])
                         ->inline()
                         ->default(false),
-                    ToggleButtons::make('user_mountable')
-                        ->label(trans('admin/mount.user_mountable'))
-                        ->helperText(trans('admin/mount.user_mountable_help'))
-                        ->stateCast(new BooleanStateCast(false, true))
-                        ->options([
-                            false => trans('admin/mount.toggles.not_user_mountable'),
-                            true => trans('admin/mount.toggles.user_mountable'),
-                        ])
-                        ->icons([
-                            false => TablerIcon::UserOff,
-                            true => TablerIcon::User,
-                        ])
-                        ->colors([
-                            false => 'warning',
-                            true => 'success',
-                        ])
-                        ->inline()
-                        ->default(true),
                     TextInput::make('source')
                         ->label(trans('admin/mount.source'))
                         ->required()

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

@@ -42,6 +42,7 @@ class CreateMount extends CreateRecord
     protected function handleRecordCreation(array $data): Model
     {
         $data['uuid'] ??= Str::uuid()->toString();
+        $data['user_mountable'] = 1;
 
         return parent::handleRecordCreation($data);
     }

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

@@ -278,14 +278,6 @@ class CreateNode extends CreateRecord
                         ->default(256)
                         ->minValue(1)
                         ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB'),
-                    TextInput::make('daemon_base')
-                        ->label(trans('admin/node.daemon_base'))
-                        ->placeholder('/var/lib/pelican/volumes')
-                        ->hintIcon(TablerIcon::QuestionMark, trans('admin/node.daemon_base_help'))
-                        ->columnSpan(1)
-                        ->required()
-                        ->default('/var/lib/pelican/volumes')
-                        ->rule('regex:/^([\/][\d\w.\-\/]+)$/'),
                     TextInput::make('daemon_sftp')
                         ->columnSpan(1)
                         ->label(trans('admin/node.sftp_port'))
@@ -295,7 +287,7 @@ class CreateNode extends CreateRecord
                         ->required()
                         ->integer(),
                     TextInput::make('daemon_sftp_alias')
-                        ->columnSpan(1)
+                        ->columnSpan(2)
                         ->label(trans('admin/node.sftp_alias'))
                         ->helperText(trans('admin/node.sftp_alias_help')),
                     Grid::make()

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

@@ -314,7 +314,7 @@ class EditNode extends EditRecord
                             'default' => 1,
                             'sm' => 1,
                             'md' => 2,
-                            'lg' => 3,
+                            'lg' => 2,
                         ]),
                     TextInput::make('upload_size')
                         ->columnSpan([
@@ -329,24 +329,12 @@ class EditNode extends EditRecord
                         ->required()
                         ->minValue(1)
                         ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB'),
-                    TextInput::make('daemon_base')
-                        ->label(trans('admin/node.daemon_base'))
-                        ->placeholder('/var/lib/pelican/volumes')
-                        ->hintIcon(TablerIcon::QuestionMark, trans('admin/node.daemon_base_help'))
-                        ->columnSpan([
-                            'default' => 1,
-                            'sm' => 1,
-                            'md' => 2,
-                            'lg' => 2,
-                        ])
-                        ->required()
-                        ->rule('regex:/^([\/][\d\w.\-\/]+)$/'),
                     TextInput::make('daemon_sftp')
                         ->columnSpan([
                             'default' => 1,
                             'sm' => 1,
-                            'md' => 2,
-                            'lg' => 1,
+                            'md' => 1,
+                            'lg' => 3,
                         ])
                         ->label(trans('admin/node.sftp_port'))
                         ->minValue(1)
@@ -358,8 +346,8 @@ class EditNode extends EditRecord
                         ->columnSpan([
                             'default' => 1,
                             'sm' => 1,
-                            'md' => 2,
-                            'lg' => 2,
+                            'md' => 1,
+                            'lg' => 3,
                         ])
                         ->label(trans('admin/node.sftp_alias'))
                         ->helperText(trans('admin/node.sftp_alias_help')),
@@ -368,7 +356,7 @@ class EditNode extends EditRecord
                             'default' => 1,
                             'sm' => 1,
                             'md' => 1,
-                            'lg' => 2,
+                            'lg' => 3,
                         ])
                         ->label(trans('admin/node.use_for_deploy'))
                         ->inline()
@@ -386,7 +374,7 @@ class EditNode extends EditRecord
                             'default' => 1,
                             'sm' => 1,
                             'md' => 1,
-                            'lg' => 2,
+                            'lg' => 3,
                         ])
                         ->label(trans('admin/node.maintenance_mode'))
                         ->inline()
@@ -584,7 +572,7 @@ class EditNode extends EditRecord
                         ->columnSpanFull()
                         ->schema([
                             Actions::make([
-                                Action::make('exclude_autoDeploy')
+                                Action::make('autoDeploy')
                                     ->label(trans('admin/node.auto_deploy'))
                                     ->color('primary')
                                     ->modalHeading(trans('admin/node.auto_deploy'))
@@ -622,7 +610,7 @@ class EditNode extends EditRecord
                                     }),
                             ])->fullWidth(),
                             Actions::make([
-                                Action::make('exclude_resetKey')
+                                Action::make('resetKey')
                                     ->label(trans('admin/node.reset_token'))
                                     ->color('danger')
                                     ->requiresConfirmation()
@@ -735,7 +723,7 @@ class EditNode extends EditRecord
                                         $set('pulled', false);
                                         $set('uploaded', true);
 
-                                    } catch (Exception $e) {
+                                    } catch (\Exception $e) {
                                         Notification::make()
                                             ->title(trans('admin/node.diagnostics.upload_failed'))
                                             ->body($e->getMessage())

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

@@ -4,7 +4,6 @@ namespace App\Filament\Admin\Resources\Nodes\Pages;
 
 use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\Nodes\NodeResource;
-use App\Filament\Components\Tables\Columns\NodeClientHealthColumn;
 use App\Filament\Components\Tables\Columns\NodeHealthColumn;
 use App\Filament\Components\Tables\Filters\TagsFilter;
 use App\Models\Node;
@@ -35,7 +34,6 @@ class ListNodes extends ListRecords
                     ->searchable()
                     ->hidden(),
                 NodeHealthColumn::make('health'),
-                NodeClientHealthColumn::make('reachable'),
                 TextColumn::make('name')
                     ->label(trans('admin/node.table.name'))
                     ->sortable()

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

@@ -91,10 +91,7 @@ class AllocationsRelationManager extends RelationManager
                     ->icon(TablerIcon::WorldPlus)
                     ->schema(fn () => [
                         Select::make('allocation_ip')
-                            ->options(fn (Get $get) => collect($this->getOwnerRecord()->ipAddresses())
-                                ->when($get('allocation_ip'), fn ($ips, $current) => $ips->push($current))
-                                ->unique()
-                                ->mapWithKeys(fn (string $ip) => [$ip => $ip]))
+                            ->options(fn () => collect($this->getOwnerRecord()->ipAddresses())->mapWithKeys(fn (string $ip) => [$ip => $ip]))
                             ->label(trans('admin/node.ip_address'))
                             ->inlineLabel()
                             ->ip()
@@ -103,25 +100,12 @@ class AllocationsRelationManager extends RelationManager
                             ->live()
                             ->hintAction(
                                 Action::make('hint_refresh')
-                                    ->hiddenLabel()
                                     ->icon(TablerIcon::Refresh)
                                     ->tooltip(trans('admin/node.refresh'))
                                     ->action(function () {
                                         cache()->forget("nodes.{$this->getOwnerRecord()->id}.ips");
                                     })
                             )
-                            ->suffixAction(
-                                Action::make('custom_ip')
-                                    ->icon(TablerIcon::Keyboard)
-                                    ->tooltip(trans('admin/node.custom_ip'))
-                                    ->schema([
-                                        TextInput::make('custom_ip')
-                                            ->label(trans('admin/node.ip_address'))
-                                            ->ip()
-                                            ->required(),
-                                    ])
-                                    ->action(fn (array $data, Set $set) => $set('allocation_ip', $data['custom_ip']))
-                            )
                             ->required(),
                         TextInput::make('allocation_alias')
                             ->label(trans('admin/node.table.alias'))

app/Filament/Admin/Resources/Plugins/PluginResource.php

@@ -5,9 +5,6 @@ namespace App\Filament\Admin\Resources\Plugins;
 use App\Enums\PluginStatus;
 use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\Plugins\Pages\ListPlugins;
-use App\Jobs\Plugin\InstallPlugin;
-use App\Jobs\Plugin\UninstallPlugin;
-use App\Jobs\Plugin\UpdatePlugin;
 use App\Models\Plugin;
 use App\Services\Helpers\PluginService;
 use BackedEnum;
@@ -94,7 +91,7 @@ class PluginResource extends Resource
                     ->url(fn (Plugin $plugin) => !$plugin->getReadme() ? $plugin->url : null, true)
                     ->slideOver(true)
                     ->modalHeading('Readme')
-                    ->modalSubmitAction(fn (Plugin $plugin) => Action::make('exclude_visit_website')
+                    ->modalSubmitAction(fn (Plugin $plugin) => Action::make('visit_website')
                         ->label(trans('admin/plugin.visit_website'))
                         ->visible(!is_null($plugin->url))
                         ->url($plugin->url, true)
@@ -122,14 +119,15 @@ class PluginResource extends Resource
                         ->icon(TablerIcon::Terminal)
                         ->color('success')
                         ->hidden(fn (Plugin $plugin) => $plugin->status !== PluginStatus::NotInstalled)
-                        ->action(function (Plugin $plugin) {
+                        ->action(function (Plugin $plugin, $livewire, PluginService $pluginService) {
                             try {
-                                InstallPlugin::dispatch(user(), $plugin);
+                                $pluginService->installPlugin($plugin, !$plugin->isTheme() || !$pluginService->hasThemePluginEnabled());
+
+                                redirect(ListPlugins::getUrl(['tab' => $livewire->activeTab]));
 
                                 Notification::make()
                                     ->success()
-                                    ->title(trans('admin/plugin.notifications.install_started'))
-                                    ->body(trans('admin/plugin.notifications.background_info'))
+                                    ->title(trans('admin/plugin.notifications.installed'))
                                     ->send();
                             } catch (Exception $exception) {
                                 Notification::make()
@@ -145,14 +143,15 @@ class PluginResource extends Resource
                         ->icon(TablerIcon::Download)
                         ->color('success')
                         ->visible(fn (Plugin $plugin) => $plugin->status !== PluginStatus::NotInstalled && $plugin->isUpdateAvailable())
-                        ->action(function (Plugin $plugin) {
+                        ->action(function (Plugin $plugin, $livewire, PluginService $pluginService) {
                             try {
-                                UpdatePlugin::dispatch(user(), $plugin);
+                                $pluginService->updatePlugin($plugin);
+
+                                redirect(ListPlugins::getUrl(['tab' => $livewire->activeTab]));
 
                                 Notification::make()
                                     ->success()
-                                    ->title(trans('admin/plugin.notifications.update_started'))
-                                    ->body(trans('admin/plugin.notifications.background_info'))
+                                    ->title(trans('admin/plugin.notifications.updated'))
                                     ->send();
                             } catch (Exception $exception) {
                                 Notification::make()
@@ -203,7 +202,7 @@ class PluginResource extends Resource
                         ->icon(TablerIcon::Trash)
                         ->color('danger')
                         ->requiresConfirmation()
-                        ->visible(fn (Plugin $plugin) => $plugin->status === PluginStatus::NotInstalled || $plugin->status === PluginStatus::Errored)
+                        ->visible(fn (Plugin $plugin) => $plugin->status === PluginStatus::NotInstalled)
                         ->action(function (Plugin $plugin, $livewire, PluginService $pluginService) {
                             $pluginService->deletePlugin($plugin);
 
@@ -221,14 +220,15 @@ class PluginResource extends Resource
                         ->color('danger')
                         ->requiresConfirmation()
                         ->hidden(fn (Plugin $plugin) => $plugin->status === PluginStatus::NotInstalled || $plugin->status === PluginStatus::Errored)
-                        ->action(function (Plugin $plugin) {
+                        ->action(function (Plugin $plugin, $livewire, PluginService $pluginService) {
                             try {
-                                UninstallPlugin::dispatch(user(), $plugin);
+                                $pluginService->uninstallPlugin($plugin);
+
+                                redirect(ListPlugins::getUrl(['tab' => $livewire->activeTab]));
 
                                 Notification::make()
                                     ->success()
-                                    ->title(trans('admin/plugin.notifications.uninstall_started'))
-                                    ->body(trans('admin/plugin.notifications.background_info'))
+                                    ->title(trans('admin/plugin.notifications.uninstalled'))
                                     ->send();
                             } catch (Exception $exception) {
                                 Notification::make()
@@ -240,7 +240,7 @@ class PluginResource extends Resource
                         }),
                 ]),
             ])
-            ->headerActions([
+            ->toolbarActions([
                 Action::make('import_from_file')
                     ->hiddenLabel()
                     ->tooltip(trans('admin/plugin.import_from_file'))

app/Filament/Admin/Resources/Roles/RoleResource.php

@@ -106,7 +106,7 @@ class RoleResource extends Resource
             ->toolbarActions([
                 CreateAction::make(),
                 BulkActionGroup::make([
-                    DeleteBulkAction::make('exclude_bulk_delete'),
+                    DeleteBulkAction::make(),
                 ]),
             ])
             ->checkIfRecordIsSelectableUsing(fn (Role $role) => !$role->isRootAdmin() && $role->users_count <= 0);

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

@@ -251,10 +251,7 @@ class CreateServer extends CreateRecord
 
                             return [
                                 Select::make('allocation_ip')
-                                    ->options(fn (Get $get) => collect(Node::find($getPage('node_id'))?->ipAddresses())
-                                        ->when($get('allocation_ip'), fn ($ips, $current) => $ips->push($current))
-                                        ->unique()
-                                        ->mapWithKeys(fn (string $ip) => [$ip => $ip]))
+                                    ->options(fn () => collect(Node::find($get('node_id'))?->ipAddresses())->mapWithKeys(fn (string $ip) => [$ip => $ip]))
                                     ->label(trans('admin/server.ip_address'))->inlineLabel()
                                     ->helperText(trans('admin/server.ip_address_helper'))
                                     ->afterStateUpdated(fn (Set $set) => $set('allocation_ports', []))
@@ -269,18 +266,6 @@ class CreateServer extends CreateRecord
                                                 cache()->forget("nodes.{$get('node_id')}.ips");
                                             })
                                     )
-                                    ->suffixAction(
-                                        Action::make('custom_ip')
-                                            ->icon(TablerIcon::Keyboard)
-                                            ->tooltip(trans('admin/node.custom_ip'))
-                                            ->schema([
-                                                TextInput::make('custom_ip')
-                                                    ->label(trans('admin/node.ip_address'))
-                                                    ->ip()
-                                                    ->required(),
-                                            ])
-                                            ->action(fn (array $data, Set $set) => $set('allocation_ip', $data['custom_ip']))
-                                    )
                                     ->required(),
                                 TextInput::make('allocation_alias')
                                     ->label(trans('admin/server.alias'))->inlineLabel()

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

@@ -4,17 +4,16 @@ namespace App\Filament\Admin\Resources\Servers\Pages;
 
 use App\Enums\SuspendAction;
 use App\Enums\TablerIcon;
-use App\Extensions\BackupAdapter\BackupAdapterService;
-use App\Extensions\BackupAdapter\Schemas\WingsBackupSchema;
 use App\Filament\Admin\Resources\Servers\ServerResource;
-use App\Filament\Components\Actions\DeleteIcon;
+use App\Filament\Components\Actions\DeleteServerIcon;
+use App\Filament\Components\Actions\ExportServerConfigAction;
 use App\Filament\Components\Actions\PreviewStartupAction;
-use App\Filament\Components\Actions\UploadIcon;
 use App\Filament\Components\Forms\Fields\MonacoEditor;
 use App\Filament\Components\Forms\Fields\StartupVariable;
 use App\Filament\Components\StateCasts\ServerConditionStateCast;
 use App\Filament\Server\Pages\Console;
 use App\Models\Allocation;
+use App\Models\Backup;
 use App\Models\Egg;
 use App\Models\Server;
 use App\Models\User;
@@ -33,6 +32,7 @@ use Exception;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Forms\Components\CheckboxList;
+use Filament\Forms\Components\FileUpload;
 use Filament\Forms\Components\Hidden;
 use Filament\Forms\Components\KeyValue;
 use Filament\Forms\Components\Repeater;
@@ -42,6 +42,7 @@ use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Toggle;
 use Filament\Forms\Components\ToggleButtons;
+use Filament\Infolists\Components\TextEntry;
 use Filament\Notifications\Notification;
 use Filament\Resources\Pages\EditRecord;
 use Filament\Schemas\Components\Actions;
@@ -60,7 +61,9 @@ use Filament\Support\Enums\Alignment;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Client\ConnectionException;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\HtmlString;
+use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
 use LogicException;
 use Random\RandomException;
 
@@ -109,18 +112,140 @@ class EditServer extends EditRecord
                 ->icon(TablerIcon::InfoCircle)
                 ->schema([
                     Grid::make()
+                        ->columns(2)
                         ->columnStart(1)
                         ->schema([
                             Image::make('', 'icon')
-                                ->hidden(fn ($record) => !$record->icon && !$record->egg->icon)
-                                ->url(fn ($record) => $record->icon ?: $record->egg->icon)
+                                ->hidden(fn ($record) => !$record->icon && !$record->egg->image)
+                                ->url(fn ($record) => $record->icon ?: $record->egg->image)
                                 ->tooltip(fn ($record) => $record->icon ? '' : trans('server/setting.server_info.icon.tooltip'))
-                                ->imageSize(150)
-                                ->columnSpanFull()
+                                ->columnSpan(2)
                                 ->alignJustify(),
-                            UploadIcon::make(),
-                            DeleteIcon::make()
-                                ->iconStoragePath(Server::getIconStoragePath()),
+                            Action::make('uploadIcon')
+                                ->icon(TablerIcon::PhotoUp)
+                                ->tooltip(trans('admin/server.import_image'))
+                                ->modal()
+                                ->modalSubmitActionLabel(trans('server/setting.server_info.icon.upload'))
+                                ->schema([
+                                    Tabs::make()
+                                        ->contained(false)
+                                        ->tabs([
+                                            Tab::make(trans('admin/egg.import.url'))
+                                                ->schema([
+                                                    Hidden::make('imageUrl'),
+                                                    Hidden::make('imageExtension'),
+                                                    TextInput::make('image_url')
+                                                        ->label(trans('admin/egg.import.image_url'))
+                                                        ->reactive()
+                                                        ->autocomplete(false)
+                                                        ->debounce(500)
+                                                        ->afterStateUpdated(function ($state, Set $set) {
+                                                            if (!$state) {
+                                                                $set('image_url_error', null);
+                                                                $set('imageUrl', null);
+                                                                $set('imageExtension', null);
+
+                                                                return;
+                                                            }
+
+                                                            try {
+                                                                if (!in_array(parse_url($state, PHP_URL_SCHEME), ['http', 'https'], true)) {
+                                                                    throw new \Exception(trans('admin/egg.import.invalid_url'));
+                                                                }
+
+                                                                if (!filter_var($state, FILTER_VALIDATE_URL)) {
+                                                                    throw new \Exception(trans('admin/egg.import.invalid_url'));
+                                                                }
+
+                                                                $extension = strtolower(pathinfo(parse_url($state, PHP_URL_PATH), PATHINFO_EXTENSION));
+
+                                                                if (!array_key_exists($extension, Server::IMAGE_FORMATS)) {
+                                                                    throw new \Exception(trans('admin/egg.import.unsupported_format', ['format' => implode(', ', array_keys(Server::IMAGE_FORMATS))]));
+                                                                }
+
+                                                                $host = parse_url($state, PHP_URL_HOST);
+                                                                $ip = gethostbyname($host);
+
+                                                                if (
+                                                                    filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE) === false
+                                                                ) {
+                                                                    throw new \Exception(trans('admin/egg.import.no_local_ip'));
+                                                                }
+
+                                                                $set('imageUrl', $state);
+                                                                $set('imageExtension', $extension);
+                                                                $set('image_url_error', null);
+
+                                                            } catch (\Exception $e) {
+                                                                $set('image_url_error', $e->getMessage());
+                                                                $set('imageUrl', null);
+                                                                $set('imageExtension', null);
+                                                            }
+                                                        }),
+                                                    TextEntry::make('image_url_error')
+                                                        ->hiddenLabel()
+                                                        ->visible(fn (Get $get) => $get('image_url_error') !== null)
+                                                        ->afterStateHydrated(fn (Get $get) => $get('image_url_error')),
+                                                    Image::make(fn (Get $get) => $get('image_url'), '')
+                                                        ->imageSize(150)
+                                                        ->visible(fn (Get $get) => $get('image_url') && !$get('image_url_error'))
+                                                        ->alignCenter(),
+                                                ]),
+                                            Tab::make(trans('admin/egg.import.file'))
+                                                ->schema([
+                                                    FileUpload::make('image')
+                                                        ->hiddenLabel()
+                                                        ->previewable()
+                                                        ->openable(false)
+                                                        ->downloadable(false)
+                                                        ->maxSize(256)
+                                                        ->maxFiles(1)
+                                                        ->columnSpanFull()
+                                                        ->alignCenter()
+                                                        ->imageEditor()
+                                                        ->image()
+                                                        ->disk('public')
+                                                        ->directory(Server::ICON_STORAGE_PATH)
+                                                        ->acceptedFileTypes([
+                                                            'image/png',
+                                                            'image/jpeg',
+                                                            'image/webp',
+                                                            'image/svg+xml',
+                                                        ])
+                                                        ->getUploadedFileNameForStorageUsing(function (TemporaryUploadedFile $file, $record) {
+                                                            return $record->uuid . '.' . $file->getClientOriginalExtension();
+                                                        }),
+                                                ]),
+                                        ]),
+                                ])
+                                ->action(function (array $data, $record): void {
+                                    if (!empty($data['imageUrl']) && !empty($data['imageExtension'])) {
+                                        $this->saveIconFromUrl($data['imageUrl'], $data['imageExtension'], $record);
+                                        Notification::make()
+                                            ->title(trans('server/setting.server_info.icon.updated'))
+                                            ->success()
+                                            ->send();
+
+                                        return;
+                                    }
+
+                                    if (!empty($data['image'])) {
+                                        Notification::make()
+                                            ->title(trans('server/setting.server_info.icon.updated'))
+                                            ->success()
+                                            ->send();
+
+                                        return;
+                                    }
+
+                                    if (empty($data['imageUrl']) && empty($data['image'])) {
+                                        Notification::make()
+                                            ->title(trans('admin/egg.import.no_image'))
+                                            ->warning()
+                                            ->send();
+                                    }
+                                }),
+                            DeleteServerIcon::make(),
                         ]),
                     Grid::make()
                         ->columns(3)
@@ -196,7 +321,7 @@ class EditServer extends EditRecord
                                                     try {
                                                         $logs = $serverRepository->setServer($server)->getInstallLogs();
 
-                                                        return convert_to_utf8($logs);
+                                                        return mb_convert_encoding($logs, 'UTF-8', ['UTF-8', 'UTF-16', 'ISO-8859-1', 'ASCII']);
                                                     } catch (ConnectionException) {
                                                         Notification::make()
                                                             ->title(trans('admin/server.notifications.error_connecting', ['node' => $server->node->name]))
@@ -811,7 +936,7 @@ class EditServer extends EditRecord
                                                         ->send();
                                                 }
                                             }),
-                                        Action::make('exclude_toggle_unsuspend')
+                                        Action::make('toggleUnsuspend')
                                             ->label(trans('admin/server.unsuspend'))
                                             ->color('success')
                                             ->hidden(fn (Server $server) => !$server->isSuspended())
@@ -851,20 +976,16 @@ class EditServer extends EditRecord
                                             ->disabled(fn (Server $server) => user()?->accessibleNodes()->count() <= 1 || $server->isInConflictState())
                                             ->modalHeading(trans('admin/server.transfer'))
                                             ->schema($this->transferServer())
-                                            ->action(function (TransferServerService $transfer, BackupAdapterService $backupService, Server $server, $data) {
+                                            ->action(function (TransferServerService $transfer, Server $server, $data) {
                                                 try {
                                                     $selectedBackupUuids = Arr::get($data, 'backups', []);
                                                     $transfer->handle($server, Arr::get($data, 'node_id'), Arr::get($data, 'allocation_id'), Arr::get($data, 'allocation_additional', []), $selectedBackupUuids);
 
                                                     $server->backups
                                                         ->whereNotIn('uuid', $selectedBackupUuids)
-                                                        ->each(function ($backup) use ($backupService) {
-                                                            $schema = $backupService->get($backup->backupHost->schema);
-
-                                                            // Wings backups that aren't transferred only need to be delete on the panel, wings will cleanup the backup files automatically
-                                                            if ($schema instanceof WingsBackupSchema) {
-                                                                $backup->delete();
-                                                            }
+                                                        ->where('disk', Backup::ADAPTER_DAEMON)
+                                                        ->each(function ($backup) {
+                                                            $backup->delete();
                                                         });
 
                                                     Notification::make()
@@ -884,6 +1005,16 @@ class EditServer extends EditRecord
                                         ->hiddenLabel()
                                         ->hint(new HtmlString(trans('admin/server.transfer_help'))),
                                 ]),
+                            Grid::make()
+                                ->columnSpan(3)
+                                ->schema([
+                                    Actions::make([
+                                        ExportServerConfigAction::make(),
+                                    ])->fullWidth(),
+                                    ToggleButtons::make('export_help')
+                                        ->hiddenLabel()
+                                        ->hint(trans('admin/server.import_export.export_description')),
+                                ]),
                             Grid::make()
                                 ->columnSpan(3)
                                 ->schema([
@@ -956,17 +1087,17 @@ class EditServer extends EditRecord
                 ->placeholder(trans('admin/server.select_additional')),
             Grid::make()
                 ->columnSpanFull()
-                ->schema(fn (BackupAdapterService $backupService) => [
+                ->schema([
                     CheckboxList::make('backups')
                         ->label(trans('admin/server.backups'))
                         ->bulkToggleable()
-                        ->options(fn (Server $server) => $server->backups->filter(fn ($backup) => $backupService->get($backup->backupHost->schema) instanceof WingsBackupSchema)->mapWithKeys(fn ($backup) => [$backup->uuid => $backup->name]))
-                        ->columns(fn (Server $record) => (int) ceil($record->backups->filter(fn ($backup) => $backupService->get($backup->backupHost->schema) instanceof WingsBackupSchema)->count() / 4)),
+                        ->options(fn (Server $server) => $server->backups->where('disk', Backup::ADAPTER_DAEMON)->mapWithKeys(fn ($backup) => [$backup->uuid => $backup->name]))
+                        ->columns(fn (Server $record) => (int) ceil($record->backups->where('disk', Backup::ADAPTER_DAEMON)->count() / 4)),
                     Text::make('backup_helper')
                         ->columnSpanFull()
                         ->content(trans('admin/server.warning_backups')),
                 ])
-                ->hidden(fn (Server $server, BackupAdapterService $backupService) => $server->backups->filter(fn ($backup) => $backupService->get($backup->backupHost->schema) instanceof WingsBackupSchema)->count() === 0),
+                ->hidden(fn (Server $server) => $server->backups->where('disk', Backup::ADAPTER_DAEMON)->count() === 0),
         ];
     }
 
@@ -1006,7 +1137,7 @@ class EditServer extends EditRecord
                 ->hidden(fn () => $canForceDelete)
                 ->authorize(fn (Server $server) => user()?->can('delete server', $server))
                 ->icon(TablerIcon::Trash),
-            Action::make('exclude_force_delete')
+            Action::make('ForceDelete')
                 ->color('danger')
                 ->label(trans('filament-actions::force-delete.single.label'))
                 ->modalHeading(trans('filament-actions::force-delete.single.modal.heading', ['label' => $this->getRecordTitle()]))
@@ -1081,4 +1212,35 @@ class EditServer extends EditRecord
     {
         return null;
     }
+
+    /**
+     * Save an icon from URL download to a file.
+     *
+     * @throws Exception
+     */
+    private function saveIconFromUrl(string $imageUrl, string $extension, Server $server): void
+    {
+        $context = stream_context_create([
+            'http' => ['timeout' => 3],
+            'https' => [
+                'timeout' => 3,
+                'verify_peer' => true,
+                'verify_peer_name' => true,
+            ],
+        ]);
+
+        $data = @file_get_contents($imageUrl, false, $context, 0, 262144); //256KB
+
+        if (empty($data)) {
+            throw new \Exception(trans('admin/egg.import.invalid_url'));
+        }
+
+        $normalizedExtension = match ($extension) {
+            'svg+xml' => 'svg',
+            'jpeg' => 'jpg',
+            default => $extension,
+        };
+
+        Storage::disk('public')->put(Server::ICON_STORAGE_PATH . "/$server->uuid.$normalizedExtension", $data);
+    }
 }

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

@@ -4,6 +4,7 @@ namespace App\Filament\Admin\Resources\Servers\Pages;
 
 use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\Servers\ServerResource;
+use App\Filament\Components\Actions\ImportServerConfigAction;
 use App\Filament\Server\Pages\Console;
 use App\Models\Server;
 use App\Traits\Filament\CanCustomizeHeaderActions;
@@ -99,6 +100,7 @@ class ListServers extends ListRecords
             ])
             ->toolbarActions([
                 CreateAction::make(),
+                ImportServerConfigAction::make(),
             ])
             ->searchable()
             ->emptyStateIcon(TablerIcon::BrandDocker)

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

@@ -113,10 +113,7 @@ class AllocationsRelationManager extends RelationManager
                     ->createAnother(false)
                     ->schema(fn () => [
                         Select::make('allocation_ip')
-                            ->options(fn (Get $get) => collect($this->getOwnerRecord()->node->ipAddresses())
-                                ->when($get('allocation_ip'), fn ($ips, $current) => $ips->push($current))
-                                ->unique()
-                                ->mapWithKeys(fn (string $ip) => [$ip => $ip]))
+                            ->options(fn () => collect($this->getOwnerRecord()->node->ipAddresses())->mapWithKeys(fn (string $ip) => [$ip => $ip]))
                             ->label(trans('admin/server.ip_address'))
                             ->inlineLabel()
                             ->ip()
@@ -129,18 +126,6 @@ class AllocationsRelationManager extends RelationManager
                                         cache()->forget("nodes.{$this->getOwnerRecord()->node->id}.ips");
                                     })
                             )
-                            ->suffixAction(
-                                Action::make('custom_ip')
-                                    ->icon(TablerIcon::Keyboard)
-                                    ->tooltip(trans('admin/node.custom_ip'))
-                                    ->schema([
-                                        TextInput::make('custom_ip')
-                                            ->label(trans('admin/node.ip_address'))
-                                            ->ip()
-                                            ->required(),
-                                    ])
-                                    ->action(fn (array $data, Set $set) => $set('allocation_ip', $data['custom_ip']))
-                            )
                             ->afterStateUpdated(fn (Set $set) => $set('allocation_ports', []))
                             ->required(),
                         TextInput::make('allocation_alias')

app/Filament/Admin/Resources/Users/UserResource.php

@@ -142,7 +142,7 @@ class UserResource extends Resource
             ])
             ->toolbarActions([
                 BulkActionGroup::make([
-                    DeleteBulkAction::make('exclude_bulk_delete'),
+                    DeleteBulkAction::make(),
                 ]),
                 CreateAction::make()
                     ->hiddenLabel()

app/Filament/Admin/Resources/Webhooks/WebhookResource.php

@@ -114,7 +114,7 @@ class WebhookResource extends Resource
             ->toolbarActions([
                 CreateAction::make(),
                 BulkActionGroup::make([
-                    DeleteBulkAction::make('exclude_bulk_delete'),
+                    DeleteBulkAction::make(),
                 ]),
             ])
             ->emptyStateIcon(TablerIcon::Webhook)

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

@@ -70,7 +70,7 @@ class ListServers extends ListRecords
             ImageColumn::make('icon')
                 ->label('')
                 ->imageSize(46)
-                ->state(fn (Server $server) => $server->icon ?: $server->egg->icon),
+                ->state(fn (Server $server) => $server->icon ?: $server->egg->image),
             TextColumn::make('condition')
                 ->label(trans('server/dashboard.status'))
                 ->badge()
@@ -81,8 +81,7 @@ class ListServers extends ListRecords
                 ->label(trans('server/dashboard.title'))
                 ->description(fn (Server $server) => $server->description)
                 ->grow()
-                ->searchable()
-                ->sortable(),
+                ->searchable(),
             TextColumn::make('allocation.address')
                 ->label('')
                 ->badge()

app/Filament/Components/Actions/DeleteIcon.php

@@ -1,79 +0,0 @@
-<?php
-
-namespace App\Filament\Components\Actions;
-
-use App\Enums\TablerIcon;
-use App\Models\Traits\HasIcon;
-use Filament\Actions\Action;
-use Filament\Notifications\Notification;
-use Illuminate\Support\Facades\Storage;
-
-class DeleteIcon extends Action
-{
-    /** @var string[] */
-    protected ?array $iconFormats = null;
-
-    protected ?string $iconStoragePath = null;
-
-    public static function getDefaultName(): ?string
-    {
-        return 'delete_icon';
-    }
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->visible(fn ($record) => $record->icon);
-
-        $this->hiddenLabel();
-
-        $this->tooltip(trans('admin/egg.import.delete_icon'));
-
-        $this->icon(TablerIcon::Trash);
-
-        $this->color('danger');
-
-        $this->action(function ($record) {
-            foreach ($this->getIconFormats() as $ext) {
-                $path = $this->getIconStoragePath() . "/$record->uuid.$ext";
-                if (Storage::disk('public')->exists($path)) {
-                    Storage::disk('public')->delete($path);
-                }
-            }
-
-            Notification::make()
-                ->title(trans('admin/egg.import.icon_deleted'))
-                ->success()
-                ->send();
-
-            $record->refresh();
-        });
-    }
-
-    /** @param string[] $iconFormats */
-    public function iconFormats(?array $iconFormats): static
-    {
-        $this->iconFormats = $iconFormats;
-
-        return $this;
-    }
-
-    public function iconStoragePath(?string $iconStoragePath): static
-    {
-        $this->iconStoragePath = $iconStoragePath;
-
-        return $this;
-    }
-
-    /** @return string[] */
-    public function getIconFormats(): array
-    {
-        return $this->iconFormats ?? array_keys(HasIcon::$iconFormats);
-    }
-
-    public function getIconStoragePath(): ?string
-    {
-        return $this->iconStoragePath;
-    }
-}

app/Filament/Components/Actions/DeleteServerIcon.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Filament\Components\Actions;
+
+use App\Enums\TablerIcon;
+use App\Models\Server;
+use Filament\Actions\Action;
+use Filament\Notifications\Notification;
+use Illuminate\Support\Facades\Storage;
+
+class DeleteServerIcon extends Action
+{
+    public static function getDefaultName(): ?string
+    {
+        return 'delete_icon';
+    }
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->visible(fn ($record) => $record->icon);
+
+        $this->hiddenLabel();
+
+        $this->tooltip(trans('admin/server.import_image'));
+
+        $this->icon(TablerIcon::Trash);
+
+        $this->color('danger');
+
+        $this->action(function ($record) {
+            foreach (array_keys(Server::IMAGE_FORMATS) as $ext) {
+                $path = Server::ICON_STORAGE_PATH . "/$record->uuid.$ext";
+                if (Storage::disk('public')->exists($path)) {
+                    Storage::disk('public')->delete($path);
+                }
+            }
+
+            Notification::make()
+                ->title(trans('server/setting.server_info.icon.deleted'))
+                ->success()
+                ->send();
+
+            $record->refresh();
+        });
+    }
+}

app/Filament/Components/Actions/ExportServerConfigAction.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Filament\Components\Actions;
+
+use App\Models\Server;
+use App\Services\Servers\Sharing\ServerConfigExporterService;
+use Filament\Actions\Action;
+use Filament\Forms\Components\Toggle;
+use Filament\Support\Enums\Alignment;
+use Filament\Support\Enums\IconSize;
+
+class ExportServerConfigAction extends Action
+{
+    public static function getDefaultName(): ?string
+    {
+        return 'export_config';
+    }
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->label(trans('filament-actions::export.modal.actions.export.label'));
+
+        $this->iconSize(IconSize::ExtraLarge);
+
+        $this->authorize(fn () => user()?->can('view server'));
+
+        $this->modalHeading(fn (Server $server) => trans('admin/server.import_export.export_heading', ['name' => $server->name]));
+
+        $this->modalDescription(trans('admin/server.import_export.export_description'));
+
+        $this->modalFooterActionsAlignment(Alignment::Center);
+
+        $this->schema([
+            Toggle::make('include_description')
+                ->label(trans('admin/server.import_export.include_description'))
+                ->helperText(trans('admin/server.import_export.include_description_help'))
+                ->default(true),
+            Toggle::make('include_allocations')
+                ->label(trans('admin/server.import_export.include_allocations'))
+                ->helperText(trans('admin/server.import_export.include_allocations_help'))
+                ->default(true),
+            Toggle::make('include_variable_values')
+                ->label(trans('admin/server.import_export.include_variables'))
+                ->helperText(trans('admin/server.import_export.include_variables_help'))
+                ->default(true),
+        ]);
+
+        $this->action(fn (ServerConfigExporterService $service, Server $server, array $data) => response()->streamDownload(
+            function () use ($service, $server, $data) {
+                echo $service->handle($server, $data);
+            },
+            'server-' . str($server->name)->kebab()->lower()->trim() . '.yaml',
+            [
+                'Content-Type' => 'application/x-yaml',
+            ]
+        ));
+    }
+}

app/Filament/Components/Actions/ImportServerConfigAction.php

@@ -0,0 +1,87 @@
+<?php
+
+namespace App\Filament\Components\Actions;
+
+use App\Exceptions\Service\InvalidFileUploadException;
+use App\Services\Servers\Sharing\ServerConfigCreatorService;
+use Filament\Actions\Action;
+use Filament\Forms\Components\FileUpload;
+use Filament\Forms\Components\Select;
+use Filament\Notifications\Notification;
+use Illuminate\Http\UploadedFile;
+
+class ImportServerConfigAction extends Action
+{
+    public static function getDefaultName(): ?string
+    {
+        return 'import_config';
+    }
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->hiddenLabel();
+
+        $this->icon('tabler-file-import');
+
+        $this->tooltip(trans('admin/server.import_export.import_tooltip'));
+
+        $this->authorize(fn () => user()?->can('create server'));
+
+        $this->modalHeading(trans('admin/server.import_export.import_heading'));
+
+        $this->modalDescription(trans('admin/server.import_export.import_description'));
+
+        $this->schema([
+            FileUpload::make('file')
+                ->label(trans('admin/server.import_export.config_file'))
+                ->hint(trans('admin/server.import_export.config_file_hint'))
+                ->acceptedFileTypes(['application/x-yaml', 'text/yaml', 'text/x-yaml', '.yaml', '.yml'])
+                ->preserveFilenames()
+                ->previewable(false)
+                ->storeFiles(false)
+                ->required()
+                ->maxSize(1024), // 1MB max
+            Select::make('node_id')
+                ->label(trans('admin/server.import_export.node_select'))
+                ->hint(trans('admin/server.import_export.node_select_hint'))
+                ->options(fn () => user()?->accessibleNodes()->pluck('name', 'id') ?? [])
+                ->searchable()
+                ->required()
+                ->visible(fn () => (user()?->accessibleNodes()->count() ?? 0) > 1),
+        ]);
+
+        $this->action(function (ServerConfigCreatorService $createService, array $data): void {
+            /** @var UploadedFile $file */
+            $file = $data['file'];
+            $nodeId = $data['node_id'] ?? user()->accessibleNodes()->first()->id;
+
+            try {
+                $server = $createService->fromFile($file, $nodeId);
+
+                Notification::make()
+                    ->title(trans('admin/server.notifications.import_created'))
+                    ->body(trans('admin/server.notifications.import_created_body', ['name' => $server->name]))
+                    ->success()
+                    ->send();
+
+                redirect()->route('filament.admin.resources.servers.edit', ['record' => $server]);
+            } catch (InvalidFileUploadException $exception) {
+                Notification::make()
+                    ->title(trans('admin/server.notifications.import_failed'))
+                    ->body($exception->getMessage())
+                    ->danger()
+                    ->send();
+            } catch (\Exception $exception) {
+                Notification::make()
+                    ->title(trans('admin/server.notifications.import_failed'))
+                    ->body(trans('admin/server.notifications.import_failed_body', ['error' => $exception->getMessage()]))
+                    ->danger()
+                    ->send();
+
+                report($exception);
+            }
+        });
+    }
+}

app/Filament/Components/Actions/RotateDatabasePasswordAction.php

@@ -16,15 +16,13 @@ class RotateDatabasePasswordAction extends Action
 {
     public static function getDefaultName(): ?string
     {
-        return 'exclude_hint_rotate';
+        return 'hint_rotate';
     }
 
     protected function setUp(): void
     {
         parent::setUp();
 
-        $this->hiddenLabel();
-
         $this->tooltip(trans('admin/databasehost.rotate'));
 
         $this->icon(TablerIcon::Refresh);

app/Filament/Components/Actions/UploadIcon.php

@@ -1,164 +0,0 @@
-<?php
-
-namespace App\Filament\Components\Actions;
-
-use App\Enums\TablerIcon;
-use App\Models\Traits\HasIcon;
-use Exception;
-use Filament\Actions\Action;
-use Filament\Forms\Components\FileUpload;
-use Filament\Forms\Components\TextInput;
-use Filament\Infolists\Components\TextEntry;
-use Filament\Notifications\Notification;
-use Filament\Schemas\Components\Image;
-use Filament\Schemas\Components\Tabs;
-use Filament\Schemas\Components\Tabs\Tab;
-use Filament\Schemas\Components\Utilities\Get;
-use Filament\Schemas\Components\Utilities\Set;
-use Illuminate\Support\Facades\Http;
-use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
-
-class UploadIcon extends Action
-{
-    /** @var string[] */
-    protected ?array $iconFormats = null;
-
-    public static function getDefaultName(): ?string
-    {
-        return 'upload_icon';
-    }
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->hiddenLabel();
-
-        $this->tooltip(trans('admin/egg.import.import_icon'));
-
-        $this->icon(TablerIcon::PhotoUp);
-
-        $this->modal();
-
-        $this->modalHeading('');
-
-        $this->modalSubmitActionLabel(trans('admin/egg.import.import_icon'));
-
-        $this->schema([
-            Tabs::make()
-                ->contained(false)
-                ->tabs([
-                    Tab::make(trans('admin/egg.import.url'))
-                        ->schema([
-                            TextInput::make('icon_url')
-                                ->label(trans('admin/egg.import.icon_url'))
-                                ->reactive()
-                                ->autocomplete(false)
-                                ->debounce(500)
-                                ->afterStateUpdated(function ($state, Set $set) {
-                                    if (!$state) {
-                                        $set('icon_url_error', null);
-
-                                        return;
-                                    }
-
-                                    try {
-                                        $this->validateIconUrl($state);
-
-                                        $set('icon_url_error', null);
-                                    } catch (Exception $exception) {
-                                        $set('icon_url_error', $exception->getMessage());
-                                    }
-                                }),
-                            TextEntry::make('icon_url_error')
-                                ->hiddenLabel()
-                                ->visible(fn (Get $get) => $get('icon_url_error') !== null)
-                                ->afterStateHydrated(fn (Get $get) => $get('icon_url_error')),
-                            Image::make(fn (Get $get) => $get('icon_url'), '')
-                                ->imageSize(150)
-                                ->visible(fn (Get $get) => $get('icon_url') && !$get('icon_url_error'))
-                                ->alignCenter(),
-                        ]),
-                    Tab::make(trans('admin/egg.import.file'))
-                        ->schema([
-                            FileUpload::make('icon')
-                                ->hiddenLabel()
-                                ->previewable()
-                                ->openable(false)
-                                ->downloadable(false)
-                                ->maxSize(256)
-                                ->maxFiles(1)
-                                ->columnSpanFull()
-                                ->alignCenter()
-                                ->imageEditor()
-                                ->image()
-                                ->acceptedFileTypes(fn () => $this->getIconFormats())
-                                ->saveUploadedFileUsing(fn (TemporaryUploadedFile $file, $record) => $record->writeIcon($file->getClientOriginalExtension(), $file->getContent())),
-                        ]),
-                ]),
-        ]);
-
-        $this->action(function (array $data, $record) {
-            if (!empty($data['icon_url'])) {
-                $this->validateIconUrl($data['icon_url']);
-
-                $content = Http::timeout(5)->connectTimeout(1)->withoutRedirecting()->get($data['icon_url'])->body();
-
-                if (empty($content)) {
-                    throw new Exception(trans('admin/egg.import.invalid_url'));
-                }
-
-                $extension = strtolower(pathinfo(parse_url($data['icon_url'], PHP_URL_PATH), PATHINFO_EXTENSION));
-
-                $record->writeIcon($extension, $content);
-
-                Notification::make()
-                    ->title(trans('admin/egg.import.icon_updated'))
-                    ->success()
-                    ->send();
-            } elseif (!empty($data['icon'])) {
-                Notification::make()
-                    ->title(trans('admin/egg.import.icon_updated'))
-                    ->success()
-                    ->send();
-            } else {
-                Notification::make()
-                    ->title(trans('admin/egg.import.no_icon'))
-                    ->warning()
-                    ->send();
-            }
-        });
-    }
-
-    protected function validateIconUrl(string $url): void
-    {
-        if (!in_array(parse_url($url, PHP_URL_SCHEME), ['http', 'https'], true)) {
-            throw new Exception(trans('admin/egg.import.invalid_url'));
-        }
-
-        if (!filter_var($url, FILTER_VALIDATE_URL)) {
-            throw new Exception(trans('admin/egg.import.invalid_url'));
-        }
-
-        $host = parse_url($url, PHP_URL_HOST);
-        $ip = gethostbyname($host);
-
-        if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE) === false) {
-            throw new Exception(trans('admin/egg.import.no_local_ip'));
-        }
-    }
-
-    /** @param string[] $iconFormats */
-    public function iconFormats(?array $iconFormats): static
-    {
-        $this->iconFormats = $iconFormats;
-
-        return $this;
-    }
-
-    /** @return string[] */
-    public function getIconFormats(): array
-    {
-        return $this->iconFormats ?? array_values(HasIcon::$iconFormats);
-    }
-}

app/Filament/Components/Forms/Fields/StartupVariable.php

@@ -49,7 +49,7 @@ class StartupVariable extends Field
 
         $this->hintIcon(TablerIcon::Code, fn (StartupVariable $component) => implode('|', $component->getVariableRules()));
 
-        $this->helperText(fn (StartupVariable $component) => $component->getVariableDesc());
+        $this->helperText(fn (StartupVariable $component) => !$component->getVariableDesc() ? '—' : $component->getVariableDesc());
 
         $this->rules(fn (StartupVariable $component) => $component->getVariableRules());
 
@@ -70,7 +70,7 @@ class StartupVariable extends Field
             ],
             StartupVariableType::Toggle => [
                 ...parent::getDefaultStateCasts(),
-                new BooleanStateCast(false, true),
+                new BooleanStateCast(false),
             ],
             default => parent::getDefaultStateCasts()
         };

app/Filament/Components/Tables/Columns/NodeClientHealthColumn.php

@@ -1,43 +0,0 @@
-<?php
-
-namespace App\Filament\Components\Tables\Columns;
-
-use Filament\Support\Enums\Alignment;
-use Filament\Tables\Columns\IconColumn;
-use Illuminate\Support\Facades\Blade;
-
-class NodeClientHealthColumn extends IconColumn
-{
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->label(trans('admin/node.table.reachable'));
-
-        $this->alignCenter();
-    }
-
-    public function toEmbeddedHtml(): string
-    {
-        $alignment = $this->getAlignment();
-
-        $attributes = $this->getExtraAttributeBag()
-            ->class([
-                'fi-ta-icon',
-                'fi-inline' => $this->isInline(),
-                'fi-ta-icon-has-line-breaks' => $this->isListWithLineBreaks(),
-                'fi-wrapped' => $this->canWrap(),
-                ($alignment instanceof Alignment) ? "fi-align-{$alignment->value}" : (is_string($alignment) ? $alignment : ''),
-            ])
-            ->toHtml();
-
-        return Blade::render(<<<'BLADE'
-            <div <?= $attributes ?>>
-                @livewire('node-client-connectivity', ['node' => $record, 'lazy' => true])
-            </div>
-        BLADE, [
-            'attributes' => $attributes,
-            'record' => $this->getRecord(),
-        ]);
-    }
-}

app/Filament/Pages/Auth/EditProfile.php

@@ -254,7 +254,7 @@ class EditProfile extends BaseEditProfile
                                         ->columnSpanFull(),
                                 ])
                                 ->headerActions([
-                                    Action::make('exclude_create_api_key')
+                                    Action::make('create_api_key')
                                         ->label(trans('filament-actions::create.single.modal.actions.create.label'))
                                         ->disabled(fn (Get $get) => empty($get('description')))
                                         ->successRedirectUrl(self::getUrl(['tab' => 'api-keys::data::tab'], panel: 'app'))
@@ -343,7 +343,7 @@ class EditProfile extends BaseEditProfile
                                     ->live(),
                             ])
                             ->headerActions([
-                                Action::make('exclude_create_ssh_key')
+                                Action::make('create_ssh_key')
                                     ->label(trans('filament-actions::create.single.modal.actions.create.label'))
                                     ->disabled(fn (Get $get) => empty($get('name')) || empty($get('public_key')))
                                     ->successRedirectUrl(self::getUrl(['tab' => 'ssh-keys::data::tab'], panel: 'app'))
@@ -426,13 +426,13 @@ class EditProfile extends BaseEditProfile
                 ->label(trans('profile.tabs.activity'))
                 ->icon(TablerIcon::History)
                 ->schema([
-                    Repeater::make('activity') // TODO: move to a table
-                        ->label(trans('profile.activity_info'))
+                    Repeater::make('activity')
+                        ->hiddenLabel()
                         ->inlineLabel(false)
                         ->deletable(false)
                         ->addable(false)
                         ->relationship(null, function (Builder $query) {
-                            $query->orderBy('timestamp', 'desc')->limit(50);
+                            $query->orderBy('timestamp', 'desc');
                         })
                         ->schema([
                             TextEntry::make('log')
@@ -474,17 +474,6 @@ class EditProfile extends BaseEditProfile
                                     false => 'Icon Button',
                                 ]),
                         ]),
-                    Section::make(trans('profile.admin'))
-                        ->collapsible()
-                        ->icon(TablerIcon::Shield)
-                        ->visible(fn (User $user) => $user->isAdmin())
-                        ->schema([
-                            ToggleButtons::make('redirect_to_admin')
-                                ->label(trans('profile.redirect_to_admin'))
-                                ->helperText(trans('profile.redirect_to_admin_help'))
-                                ->inline()
-                                ->boolean(),
-                        ]),
                     Section::make(trans('profile.console'))
                         ->collapsible()
                         ->icon(TablerIcon::Terminal2)
@@ -610,7 +599,6 @@ class EditProfile extends BaseEditProfile
             'dashboard_layout' => $data['dashboard_layout'],
             'top_navigation' => $data['top_navigation'],
             'button_style' => $data['button_style'],
-            'redirect_to_admin' => $data['redirect_to_admin'] ?? $this->getUser()->getCustomization(CustomizationKey::RedirectToAdmin),
         ];
 
         unset(
@@ -620,7 +608,6 @@ class EditProfile extends BaseEditProfile
             $data['dashboard_layout'],
             $data['top_navigation'],
             $data['button_style'],
-            $data['redirect_to_admin'],
         );
 
         $data['customization'] = json_encode($customization);
@@ -636,7 +623,6 @@ class EditProfile extends BaseEditProfile
         $data['console_graph_period'] = (int) $this->getUser()->getCustomization(CustomizationKey::ConsoleGraphPeriod);
         $data['dashboard_layout'] = $this->getUser()->getCustomization(CustomizationKey::DashboardLayout);
         $data['button_style'] = $this->getUser()->getCustomization(CustomizationKey::ButtonStyle);
-        $data['redirect_to_admin'] = $this->getUser()->getCustomization(CustomizationKey::RedirectToAdmin);
 
         // Handle migration from boolean to string navigation types
         $topNavigation = $this->getUser()->getCustomization(CustomizationKey::TopNavigation);

app/Filament/Pages/Auth/Login.php

@@ -4,8 +4,6 @@ namespace App\Filament\Pages\Auth;
 
 use App\Extensions\Captcha\CaptchaService;
 use App\Extensions\OAuth\OAuthService;
-use BladeUI\Icons\Exceptions\SvgNotFound;
-use BladeUI\Icons\Factory as IconFactory;
 use Filament\Actions\Action;
 use Filament\Auth\Pages\Login as BaseLogin;
 use Filament\Forms\Components\TextInput;
@@ -21,13 +19,10 @@ class Login extends BaseLogin
 
     protected CaptchaService $captchaService;
 
-    protected IconFactory $iconFactory;
-
-    public function boot(OAuthService $oauthService, CaptchaService $captchaService, IconFactory $iconFactory): void
+    public function boot(OAuthService $oauthService, CaptchaService $captchaService): void
     {
         $this->oauthService = $oauthService;
         $this->captchaService = $captchaService;
-        $this->iconFactory = $iconFactory;
     }
 
     public function form(Schema $schema): Schema
@@ -71,14 +66,6 @@ class Login extends BaseLogin
             ->extraInputAttributes(['tabindex' => 1]);
     }
 
-    protected function getPasswordFormComponent(): Component
-    {
-        /** @var TextInput $component */
-        $component = parent::getPasswordFormComponent();
-
-        return $component->extraInputAttributes(['tabindex' => 2]);
-    }
-
     protected function getOAuthFormComponent(): Component
     {
         $actions = [];
@@ -92,18 +79,9 @@ class Login extends BaseLogin
             $color = $schema->getHexColor();
             $color = is_string($color) ? Color::hex($color) : null;
 
-            $icon = $schema->getIcon();
-            if (is_string($icon)) {
-                try {
-                    $this->iconFactory->svg($icon);
-                } catch (SvgNotFound) {
-                    $icon = null;
-                }
-            }
-
             $actions[] = Action::make("oauth_$id")
                 ->label($schema->getName())
-                ->icon($icon)
+                ->icon($schema->getIcon())
                 ->color($color)
                 ->url(route('auth.oauth.redirect', ['driver' => $id], false));
         }

app/Filament/Server/Pages/Console.php

@@ -78,15 +78,11 @@ class Console extends Page
         $feature = data_get($data, 'key');
 
         $feature = $this->featureService->get($feature);
-        if (!$feature) {
+        if (!$feature || $this->getMountedAction()) {
             return;
         }
-
-        if ($this->getMountedAction()) {
-            $this->replaceMountedAction($feature->getId());
-        } else {
-            $this->mountAction($feature->getId());
-        }
+        $this->mountAction($feature->getId());
+        sleep(2); // TODO find a better way
     }
 
     public function getWidgetData(): array

app/Filament/Server/Pages/Mounts.php

@@ -1,114 +0,0 @@
-<?php
-
-namespace App\Filament\Server\Pages;
-
-use App\Enums\SubuserPermission;
-use App\Enums\TablerIcon;
-use App\Facades\Activity;
-use App\Models\Mount;
-use App\Models\Server;
-use BackedEnum;
-use Exception;
-use Filament\Facades\Filament;
-use Filament\Forms\Components\CheckboxList;
-use Filament\Notifications\Notification;
-use Filament\Schemas\Components\Section;
-use Filament\Schemas\Schema;
-use Illuminate\Support\HtmlString;
-
-class Mounts extends ServerFormPage
-{
-    protected static string|BackedEnum|null $navigationIcon = TablerIcon::LayersLinked;
-
-    protected static ?int $navigationSort = 9;
-
-    public static function canAccess(): bool
-    {
-        return parent::canAccess() && user()?->can(SubuserPermission::MountRead, Filament::getTenant());
-    }
-
-    protected function authorizeAccess(): void
-    {
-        abort_unless(user()?->can(SubuserPermission::MountRead, Filament::getTenant()), 403);
-    }
-
-    protected function fillForm(): void
-    {
-        $this->form->fill([
-            'mounts' => $this->getRecord()->mounts->pluck('id')->toArray(),
-        ]);
-    }
-
-    public function form(Schema $schema): Schema
-    {
-        $server = $this->getRecord();
-
-        $allowedMounts = Mount::query()
-            ->where('user_mountable', true)
-            ->where(function ($query) use ($server) {
-                $query->whereDoesntHave('nodes')
-                    ->orWhereHas('nodes', fn ($q) => $q->where('nodes.id', $server->node_id));
-            })
-            ->where(function ($query) use ($server) {
-                $query->whereDoesntHave('eggs')
-                    ->orWhereHas('eggs', fn ($q) => $q->where('eggs.id', $server->egg_id));
-            })
-            ->get();
-
-        return parent::form($schema)
-            ->components([
-                Section::make([
-                    CheckboxList::make('mounts')
-                        ->label(trans('server/mount.description'))
-                        ->relationship('mounts')
-                        ->options(fn () => $allowedMounts->mapWithKeys(fn (Mount $mount) => [$mount->id => $mount->name]))
-                        ->descriptions(fn () => $allowedMounts->mapWithKeys(fn (Mount $mount) => [$mount->id => new HtmlString(str("$mount->source -> $mount->target")->stripTags() . ($mount->description ? '<br>' . str($mount->description)->stripTags() : ''))]))
-                        ->helperText(fn () => $allowedMounts->isEmpty() ? trans('server/mount.no_mounts') : null)
-                        ->disabled(fn (Server $server) => !user()?->can(SubuserPermission::MountUpdate, $server))
-                        ->bulkToggleable()
-                        ->live()
-                        ->afterStateUpdated(function ($state) {
-                            $this->save();
-                        })
-                        ->columnSpanFull(),
-                ]),
-            ]);
-    }
-
-    public function save(): void
-    {
-        abort_unless(user()?->can(SubuserPermission::MountUpdate, $this->getRecord()), 403);
-
-        try {
-            $this->form->getState();
-            $this->form->saveRelationships();
-
-            Activity::event('server:mount.update')
-                ->log();
-
-            Notification::make()
-                ->title(trans('server/mount.notification_updated'))
-                ->body(trans('server/mount.notification_updated_body'))
-                ->success()
-                ->send();
-        } catch (Exception $exception) {
-            report($exception);
-
-            Notification::make()
-                ->title(trans('server/mount.notification_failed'))
-                ->body($exception->getMessage())
-                ->danger()
-                ->send();
-        }
-    }
-
-    public function getTitle(): string
-    {
-        return trans('server/mount.title');
-    }
-
-    public static function getNavigationLabel(): string
-    {
-        return trans('server/mount.title');
-    }
-}

app/Filament/Server/Pages/Settings.php

@@ -5,13 +5,14 @@ namespace App\Filament\Server\Pages;
 use App\Enums\SubuserPermission;
 use App\Enums\TablerIcon;
 use App\Facades\Activity;
-use App\Filament\Components\Actions\DeleteIcon;
-use App\Filament\Components\Actions\UploadIcon;
+use App\Filament\Components\Actions\DeleteServerIcon;
 use App\Models\Server;
 use App\Services\Servers\ReinstallServerService;
 use BackedEnum;
 use Exception;
 use Filament\Actions\Action;
+use Filament\Forms\Components\FileUpload;
+use Filament\Forms\Components\Hidden;
 use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
 use Filament\Infolists\Components\TextEntry;
@@ -20,14 +21,20 @@ use Filament\Schemas\Components\Fieldset;
 use Filament\Schemas\Components\Grid;
 use Filament\Schemas\Components\Image;
 use Filament\Schemas\Components\Section;
+use Filament\Schemas\Components\Tabs;
+use Filament\Schemas\Components\Tabs\Tab;
+use Filament\Schemas\Components\Utilities\Get;
+use Filament\Schemas\Components\Utilities\Set;
 use Filament\Schemas\Schema;
 use Filament\Support\Enums\Alignment;
+use Illuminate\Support\Facades\Storage;
+use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
 
 class Settings extends ServerFormPage
 {
     protected static string|BackedEnum|null $navigationIcon = TablerIcon::Settings;
 
-    protected static ?int $navigationSort = 11;
+    protected static ?int $navigationSort = 10;
 
     /**
      * @throws Exception
@@ -72,20 +79,140 @@ class Settings extends ServerFormPage
                                             ->afterStateUpdated(fn ($state, Server $server) => $this->updateDescription($state ?? '', $server)),
                                     ]),
                                 Grid::make()
+                                    ->columns(2)
                                     ->columnStart(6)
                                     ->schema([
                                         Image::make('', 'icon')
-                                            ->hidden(fn ($record) => !$record->icon && !$record->egg->icon)
-                                            ->url(fn ($record) => $record->icon ?: $record->egg->icon)
+                                            ->hidden(fn ($record) => !$record->icon && !$record->egg->image)
+                                            ->url(fn ($record) => $record->icon ?: $record->egg->image)
                                             ->tooltip(fn ($record) => $record->icon ? '' : trans('server/setting.server_info.icon.tooltip'))
-                                            ->imageSize(150)
-                                            ->columnSpanFull()
+                                            ->columnSpan(2)
                                             ->alignJustify(),
-                                        UploadIcon::make()
-                                            ->authorize(fn (Server $server) => user()?->can(SubuserPermission::SettingsChangeIcon, $server)),
-                                        DeleteIcon::make()
-                                            ->iconStoragePath(Server::getIconStoragePath())
-                                            ->authorize(fn (Server $server) => user()?->can(SubuserPermission::SettingsChangeIcon, $server)),
+                                        Action::make('uploadIcon')
+                                            ->hiddenLabel()
+                                            ->tooltip(trans('admin/server.import_image'))
+                                            ->icon(TablerIcon::PhotoUp)
+                                            ->modal()
+                                            ->modalSubmitActionLabel(trans('server/setting.server_info.icon.upload'))
+                                            ->schema([
+                                                Tabs::make()
+                                                    ->contained(false)
+                                                    ->tabs([
+                                                        Tab::make(trans('admin/egg.import.url'))
+                                                            ->schema([
+                                                                Hidden::make('imageUrl'),
+                                                                Hidden::make('imageExtension'),
+                                                                TextInput::make('image_url')
+                                                                    ->label(trans('admin/egg.import.image_url'))
+                                                                    ->reactive()
+                                                                    ->autocomplete(false)
+                                                                    ->debounce(500)
+                                                                    ->afterStateUpdated(function ($state, Set $set) {
+                                                                        if (!$state) {
+                                                                            $set('image_url_error', null);
+                                                                            $set('imageUrl', null);
+                                                                            $set('imageExtension', null);
+
+                                                                            return;
+                                                                        }
+
+                                                                        try {
+                                                                            if (!in_array(parse_url($state, PHP_URL_SCHEME), ['http', 'https'], true)) {
+                                                                                throw new \Exception(trans('admin/egg.import.invalid_url'));
+                                                                            }
+
+                                                                            if (!filter_var($state, FILTER_VALIDATE_URL)) {
+                                                                                throw new \Exception(trans('admin/egg.import.invalid_url'));
+                                                                            }
+
+                                                                            $extension = strtolower(pathinfo(parse_url($state, PHP_URL_PATH), PATHINFO_EXTENSION));
+
+                                                                            if (!array_key_exists($extension, Server::IMAGE_FORMATS)) {
+                                                                                throw new \Exception(trans('admin/egg.import.unsupported_format', ['format' => implode(', ', array_keys(Server::IMAGE_FORMATS))]));
+                                                                            }
+
+                                                                            $host = parse_url($state, PHP_URL_HOST);
+                                                                            $ip = gethostbyname($host);
+
+                                                                            if (
+                                                                                filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE) === false
+                                                                            ) {
+                                                                                throw new \Exception(trans('admin/egg.import.no_local_ip'));
+                                                                            }
+
+                                                                            $set('imageUrl', $state);
+                                                                            $set('imageExtension', $extension);
+                                                                            $set('image_url_error', null);
+
+                                                                        } catch (\Exception $e) {
+                                                                            $set('image_url_error', $e->getMessage());
+                                                                            $set('imageUrl', null);
+                                                                            $set('imageExtension', null);
+                                                                        }
+                                                                    }),
+                                                                TextEntry::make('image_url_error')
+                                                                    ->hiddenLabel()
+                                                                    ->visible(fn (Get $get) => $get('image_url_error') !== null)
+                                                                    ->afterStateHydrated(fn (Get $get) => $get('image_url_error')),
+                                                                Image::make(fn (Get $get) => $get('image_url'), '')
+                                                                    ->imageSize(150)
+                                                                    ->visible(fn (Get $get) => $get('image_url') && !$get('image_url_error'))
+                                                                    ->alignCenter(),
+                                                            ]),
+                                                        Tab::make(trans('admin/egg.import.file'))
+                                                            ->schema([
+                                                                FileUpload::make('image')
+                                                                    ->hiddenLabel()
+                                                                    ->previewable()
+                                                                    ->openable(false)
+                                                                    ->downloadable(false)
+                                                                    ->maxSize(256)
+                                                                    ->maxFiles(1)
+                                                                    ->columnSpanFull()
+                                                                    ->alignCenter()
+                                                                    ->imageEditor()
+                                                                    ->image()
+                                                                    ->disk('public')
+                                                                    ->directory(Server::ICON_STORAGE_PATH)
+                                                                    ->acceptedFileTypes([
+                                                                        'image/png',
+                                                                        'image/jpeg',
+                                                                        'image/webp',
+                                                                        'image/svg+xml',
+                                                                    ])
+                                                                    ->getUploadedFileNameForStorageUsing(function (TemporaryUploadedFile $file, $record) {
+                                                                        return $record->uuid . '.' . $file->getClientOriginalExtension();
+                                                                    }),
+                                                            ]),
+                                                    ]),
+                                            ])
+                                            ->action(function (array $data, $record): void {
+
+                                                if (!empty($data['imageUrl']) && !empty($data['imageExtension'])) {
+                                                    $this->saveIconFromUrl($data['imageUrl'], $data['imageExtension'], $record);
+                                                    Notification::make()
+                                                        ->title(trans('server/setting.server_info.icon.updated'))
+                                                        ->success()
+                                                        ->send();
+
+                                                    return;
+                                                }
+
+                                                if (!empty($data['image'])) {
+                                                    Notification::make()
+                                                        ->title(trans('server/setting.server_info.icon.updated'))
+                                                        ->success()
+                                                        ->send();
+                                                }
+
+                                                if (empty($data['imageUrl']) && empty($data['image'])) {
+                                                    Notification::make()
+                                                        ->title(trans('admin/egg.import.no_image'))
+                                                        ->warning()
+                                                        ->send();
+                                                }
+                                            }),
+                                        DeleteServerIcon::make(),
                                     ]),
                                 TextInput::make('uuid')
                                     ->label(trans('server/setting.server_info.uuid'))
@@ -319,6 +446,37 @@ class Settings extends ServerFormPage
         }
     }
 
+    /**
+     * Save an icon from URL download to a file.
+     *
+     * @throws Exception
+     */
+    private function saveIconFromUrl(string $imageUrl, string $extension, Server $server): void
+    {
+        $context = stream_context_create([
+            'http' => ['timeout' => 3],
+            'https' => [
+                'timeout' => 3,
+                'verify_peer' => true,
+                'verify_peer_name' => true,
+            ],
+        ]);
+
+        $data = @file_get_contents($imageUrl, false, $context, 0, 262144); //256KB
+
+        if (empty($data)) {
+            throw new \Exception(trans('admin/egg.import.invalid_url'));
+        }
+
+        $normalizedExtension = match ($extension) {
+            'svg+xml' => 'svg',
+            'jpeg' => 'jpg',
+            default => $extension,
+        };
+
+        Storage::disk('public')->put(Server::ICON_STORAGE_PATH . "/$server->uuid.$normalizedExtension", $data);
+    }
+
     public function getTitle(): string
     {
         return trans('server/setting.title');

app/Filament/Server/Pages/Startup.php

@@ -28,7 +28,7 @@ class Startup extends ServerFormPage
 {
     protected static string|BackedEnum|null $navigationIcon = TablerIcon::PlayerPlay;
 
-    protected static ?int $navigationSort = 10;
+    protected static ?int $navigationSort = 9;
 
     /**
      * @throws Exception
@@ -149,16 +149,12 @@ class Startup extends ServerFormPage
         return parent::canAccess() && user()?->can(SubuserPermission::StartupRead, Filament::getTenant());
     }
 
-    public function update(null|string|bool $state, ServerVariable $serverVariable): void
+    public function update(?string $state, ServerVariable $serverVariable): void
     {
         if (!$serverVariable->variable->user_editable) {
             return;
         }
 
-        if (is_bool($state)) {
-            $state = $state ? '1' : '0';
-        }
-
         $original = $serverVariable->variable_value;
 
         try {

app/Filament/Server/Resources/Activities/ActivityResource.php

@@ -139,7 +139,6 @@ class ActivityResource extends Resource
             ]);
     }
 
-    /** @return Builder<ActivityLog> */
     public static function getEloquentQuery(): Builder
     {
         /** @var Server $server */

app/Filament/Server/Resources/Backups/BackupResource.php

@@ -27,6 +27,7 @@ use BackedEnum;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Actions\CreateAction;
+use Filament\Actions\DeleteAction;
 use Filament\Facades\Filament;
 use Filament\Forms\Components\Checkbox;
 use Filament\Forms\Components\Textarea;
@@ -76,7 +77,7 @@ class BackupResource extends Resource
         /** @var Server $server */
         $server = Filament::getTenant();
 
-        return $server->backup_limit ?? 0;
+        return $server->backup_limit;
     }
 
     public static function defaultForm(Schema $schema): Schema
@@ -127,7 +128,7 @@ class BackupResource extends Resource
             ])
             ->recordActions([
                 ActionGroup::make([
-                    Action::make('exclude_rename')
+                    Action::make('rename')
                         ->icon(TablerIcon::Pencil)
                         ->authorize(fn () => user()?->can(SubuserPermission::BackupDelete, $server))
                         ->label(trans('server/backup.actions.rename.title'))
@@ -157,22 +158,22 @@ class BackupResource extends Resource
                                 ->send();
                         })
                         ->visible(fn (Backup $backup) => $backup->status === BackupStatus::Successful),
-                    Action::make('exclude_lock')
+                    Action::make('lock')
                         ->iconSize(IconSize::Large)
                         ->icon(fn (Backup $backup) => !$backup->is_locked ? TablerIcon::Lock : TablerIcon::LockOpen)
                         ->authorize(fn () => user()?->can(SubuserPermission::BackupDelete, $server))
                         ->label(fn (Backup $backup) => !$backup->is_locked ? trans('server/backup.actions.lock.lock') : trans('server/backup.actions.lock.unlock'))
                         ->action(fn (BackupController $backupController, Backup $backup, Request $request) => $backupController->toggleLock($request, $server, $backup))
                         ->visible(fn (Backup $backup) => $backup->status === BackupStatus::Successful),
-                    Action::make('exclude_download')
+                    Action::make('download')
                         ->label(trans('server/backup.actions.download'))
                         ->iconSize(IconSize::Large)
                         ->color('primary')
                         ->icon(TablerIcon::Download)
                         ->authorize(fn () => user()?->can(SubuserPermission::BackupDownload, $server))
-                        ->url(fn (DownloadLinkService $downloadLinkService, Backup $backup) => $downloadLinkService->handle($backup, user()), true)
+                        ->url(fn (DownloadLinkService $downloadLinkService, Backup $backup, Request $request) => $downloadLinkService->handle($backup, $request->user()), true)
                         ->visible(fn (Backup $backup) => $backup->status === BackupStatus::Successful),
-                    Action::make('exclude_restore')
+                    Action::make('restore')
                         ->label(trans('server/backup.actions.restore.title'))
                         ->iconSize(IconSize::Large)
                         ->color('success')
@@ -207,13 +208,17 @@ class BackupResource extends Resource
                                 ->property(['name' => $backup->name, 'truncate' => $data['truncate']]);
 
                             $log->transaction(function () use ($downloadLinkService, $daemonRepository, $backup, $server, $data) {
-                                $url = $downloadLinkService->handle($backup, user());
+                                // If the backup is for an S3 file we need to generate a unique Download link for
+                                // it that will allow daemon to actually access the file.
+                                if ($backup->disk === Backup::ADAPTER_AWS_S3) {
+                                    $url = $downloadLinkService->handle($backup, user());
+                                }
 
                                 // Update the status right away for the server so that we know not to allow certain
                                 // actions against it via the Panel API.
                                 $server->update(['status' => ServerState::RestoringBackup]);
 
-                                $daemonRepository->setServer($server)->restore($backup, $url, $data['truncate']);
+                                $daemonRepository->setServer($server)->restore($backup, $url ?? null, $data['truncate']);
                             });
 
                             return Notification::make()
@@ -221,12 +226,7 @@ class BackupResource extends Resource
                                 ->send();
                         })
                         ->visible(fn (Backup $backup) => $backup->status === BackupStatus::Successful),
-                    Action::make('exclude_delete')
-                        ->icon(TablerIcon::Trash)
-                        ->color('danger')
-                        ->requiresConfirmation()
-                        ->authorize(fn () => user()?->can(SubuserPermission::BackupDelete, $server))
-                        ->label(trans('filament-actions::delete.single.label'))
+                    DeleteAction::make('delete')
                         ->iconSize(IconSize::Large)
                         ->disabled(fn (Backup $backup) => $backup->is_locked && $backup->status !== BackupStatus::Failed)
                         ->modalDescription(fn (Backup $backup) => trans('server/backup.actions.delete.description', ['backup' => $backup->name]))

app/Filament/Server/Resources/Databases/DatabaseResource.php

@@ -62,7 +62,7 @@ class DatabaseResource extends Resource
         /** @var Server $server */
         $server = Filament::getTenant();
 
-        return $server->database_limit ?? 0;
+        return $server->database_limit;
     }
 
     /**

app/Filament/Server/Resources/Files/Pages/EditFiles.php

@@ -149,7 +149,7 @@ class EditFiles extends Page
                                 try {
                                     $contents = $this->getDaemonFileRepository()->getContent($this->path, config('panel.files.max_edit_size'));
 
-                                    return convert_to_utf8($contents);
+                                    return mb_convert_encoding($contents, 'UTF-8', ['UTF-8', 'UTF-16', 'ISO-8859-1', 'ASCII']);
                                 } catch (FileSizeTooLargeException) {
                                     AlertBanner::make('file_too_large')
                                         ->title(trans('server/file.alerts.file_too_large.title', ['name' => basename($this->path)]))
@@ -259,9 +259,9 @@ class EditFiles extends Page
         return $this->fileRepository;
     }
 
-    public static function getUrl(array $parameters = [], bool $isAbsolute = true, ?string $panel = null, ?Model $tenant = null, bool $shouldGuessMissingParameters = false, ?string $configuration = null): string
+    public static function getUrl(array $parameters = [], bool $isAbsolute = true, ?string $panel = null, ?Model $tenant = null, bool $shouldGuessMissingParameters = false): string
     {
-        return parent::getUrl($parameters, $isAbsolute, $panel, $tenant, $shouldGuessMissingParameters, $configuration) . '/';
+        return parent::getUrl($parameters, $isAbsolute, $panel, $tenant) . '/';
     }
 
     public static function route(string $path): PageRegistration

app/Filament/Server/Resources/Files/Pages/ListFiles.php

@@ -209,18 +209,16 @@ class ListFiles extends ListRecords
                                 ->required()
                                 ->live(),
                             TextEntry::make('new_location')
-                                ->state(fn (Get $get, File $file) => resolve_path(join_paths($this->path, str_ends_with($get('location') ?? '/', '/') ? join_paths($get('location') ?? '/', $file->name) : $get('location') ?? '/'))),
+                                ->state(fn (Get $get, File $file) => resolve_path(join_paths($this->path, $get('location') ?? '/', $file->name))),
                         ])
                         ->action(function ($data, File $file) {
                             $location = $data['location'];
-                            $endsWithSlash = str_ends_with($location, '/');
-                            $to = $endsWithSlash ? join_paths($location, $file->name) : $location;
-                            $files = [['to' => $to, 'from' => $file->name]];
+                            $files = [['to' => join_paths($location, $file->name), 'from' => $file->name]];
 
                             $this->getDaemonFileRepository()->renameFiles($this->path, $files);
 
                             $oldLocation = join_paths($this->path, $file->name);
-                            $newLocation = resolve_path(join_paths($this->path, $to));
+                            $newLocation = resolve_path(join_paths($this->path, $location, $file->name));
 
                             Activity::event('server:file.rename')
                                 ->property('directory', $this->path)

app/Filament/Server/Resources/Schedules/Pages/CreateSchedule.php

@@ -8,7 +8,6 @@ use App\Models\Schedule;
 use App\Models\Server;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use Filament\Actions\Action;
 use Filament\Facades\Filament;
 use Filament\Resources\Pages\CreateRecord;
 
@@ -21,17 +20,6 @@ class CreateSchedule extends CreateRecord
 
     protected static bool $canCreateAnother = false;
 
-    protected function getCreateFormAction(): Action
-    {
-        $hasFormWrapper = $this->hasFormWrapper();
-
-        return Action::make('exclude_create')
-            ->label(__('filament-panels::resources/pages/create-record.form.actions.create.label'))
-            ->submit($hasFormWrapper ? $this->getSubmitFormLivewireMethodName() : null)
-            ->action($hasFormWrapper ? null : $this->getSubmitFormLivewireMethodName())
-            ->keyBindings(['mod+s']);
-    }
-
     protected function afterCreate(): void
     {
         /** @var Schedule $schedule */

app/Filament/Server/Resources/Schedules/RelationManagers/TasksRelationManager.php

@@ -7,7 +7,6 @@ use App\Facades\Activity;
 use App\Models\Schedule;
 use App\Models\Task;
 use Exception;
-use Filament\Actions\Action;
 use Filament\Actions\CreateAction;
 use Filament\Actions\DeleteAction;
 use Filament\Actions\EditAction;
@@ -74,7 +73,6 @@ class TasksRelationManager extends RelationManager
         return $table
             ->reorderable('sequence_id')
             ->defaultSort('sequence_id')
-            ->reorderRecordsTriggerAction(fn (Action $action, bool $isReordering) => $action->hiddenLabel()->tooltip(fn () => $action->getLabel()))
             ->columns([
                 TextColumn::make('action')
                     ->label(trans('server/schedule.tasks.actions.title'))

app/Filament/Server/Resources/Schedules/ScheduleResource.php

@@ -97,7 +97,8 @@ class ScheduleResource extends Resource
                     ->formatStateUsing(fn (?Schedule $schedule) => $schedule?->status->value ?? 'new')
                     ->options(fn (?Schedule $schedule) => [$schedule?->status->value ?? 'new' => $schedule?->status->getLabel() ?? 'New'])
                     ->visibleOn('view'),
-                Section::make(trans('server/schedule.cron'))
+                Section::make('Cron')
+                    ->label(trans('server/schedule.cron'))
                     ->description(function (Get $get) {
                         try {
                             $nextRun = Utilities::getScheduleNextRunDate($get('cron_minute'), $get('cron_hour'), $get('cron_day_of_month'), $get('cron_month'), $get('cron_day_of_week'))->timezone(user()->timezone ?? 'UTC');
@@ -109,22 +110,22 @@ class ScheduleResource extends Resource
                     })
                     ->schema([
                         Actions::make([
-                            CronPresetAction::make('exclude_hourly')
+                            CronPresetAction::make('hourly')
                                 ->label(trans('server/schedule.time.hourly'))
                                 ->cron('0', '*', '*', '*', '*'),
-                            CronPresetAction::make('exclude_daily')
+                            CronPresetAction::make('daily')
                                 ->label(trans('server/schedule.time.daily'))
                                 ->cron('0', '0', '*', '*', '*'),
-                            CronPresetAction::make('exclude_weekly_monday')
+                            CronPresetAction::make('weekly_monday')
                                 ->label(trans('server/schedule.time.weekly_mon'))
                                 ->cron('0', '0', '*', '*', '1'),
-                            CronPresetAction::make('exclude_weekly_sunday')
+                            CronPresetAction::make('weekly_sunday')
                                 ->label(trans('server/schedule.time.weekly_sun'))
                                 ->cron('0', '0', '*', '*', '0'),
-                            CronPresetAction::make('exclude_monthly')
+                            CronPresetAction::make('monthly')
                                 ->label(trans('server/schedule.time.monthly'))
                                 ->cron('0', '0', '1', '*', '*'),
-                            CronPresetAction::make('exclude_every_x_minutes')
+                            CronPresetAction::make('every_x_minutes')
                                 ->label(trans('server/schedule.time.every_min'))
                                 ->color(fn (Get $get) => str($get('cron_minute'))->startsWith('*/')
                                                     && $get('cron_hour') == '*'
@@ -147,7 +148,7 @@ class ScheduleResource extends Resource
                                     $set('cron_month', '*');
                                     $set('cron_day_of_week', '*');
                                 }),
-                            CronPresetAction::make('exclude_every_x_hours')
+                            CronPresetAction::make('every_x_hours')
                                 ->color(fn (Get $get) => $get('cron_minute') == '0'
                                                     && str($get('cron_hour'))->startsWith('*/')
                                                     && $get('cron_day_of_month') == '*'
@@ -169,7 +170,7 @@ class ScheduleResource extends Resource
                                     $set('cron_month', '*');
                                     $set('cron_day_of_week', '*');
                                 }),
-                            CronPresetAction::make('exclude_every_x_days')
+                            CronPresetAction::make('every_x_days')
                                 ->color(fn (Get $get) => $get('cron_minute') == '0'
                                                     && $get('cron_hour') == '0'
                                                     && str($get('cron_day_of_month'))->startsWith('*/')
@@ -191,7 +192,7 @@ class ScheduleResource extends Resource
                                     $set('cron_month', '*');
                                     $set('cron_day_of_week', '*');
                                 }),
-                            CronPresetAction::make('exclude_every_x_months')
+                            CronPresetAction::make('every_x_months')
                                 ->color(fn (Get $get) => $get('cron_minute') == '0'
                                                     && $get('cron_hour') == '0'
                                                     && $get('cron_day_of_month') == '1'
@@ -213,7 +214,7 @@ class ScheduleResource extends Resource
                                     $set('cron_month', '*/' . $data['x']);
                                     $set('cron_day_of_week', '*');
                                 }),
-                            CronPresetAction::make('exclude_every_x_day_of_week')
+                            CronPresetAction::make('every_x_day_of_week')
                                 ->color(fn (Get $get) => $get('cron_minute') == '0'
                                                     && $get('cron_hour') == '0'
                                                     && $get('cron_day_of_month') == '*'

app/Filament/Server/Resources/Subusers/SubuserResource.php

@@ -79,15 +79,15 @@ class SubuserResource extends Resource
 
             foreach ($data['permissions'] as $permission) {
                 $options[$permission] = str($permission)->headline();
-                $descriptions[$permission] = trans($data['translation_prefix']. '.' . $data['name'] . '_' . str($permission)->replace('-', '_'));
+                $descriptions[$permission] = trans('server/user.permissions.' . $data['name'] . '_' . str($permission)->replace('-', '_'));
                 $permissionsArray[$data['name']][] = $permission;
             }
 
             $tabs[] = Tab::make($data['name'])
-                ->label(trans($data['translation_prefix']. '.' . $data['name'] . '_title'))
+                ->label(str($data['name'])->headline())
                 ->schema([
                     Section::make()
-                        ->description(trans($data['translation_prefix']. '.' . $data['name'] . '_desc'))
+                        ->description(trans('server/user.permissions.' . $data['name'] . '_desc'))
                         ->icon($data['icon'])
                         ->contained(false)
                         ->schema([
@@ -123,6 +123,18 @@ class SubuserResource extends Resource
                     ),
             ])
             ->recordActions([
+                DeleteAction::make()
+                    ->label(trans('server/user.delete'))
+                    ->hidden(fn (Subuser $subuser) => user()?->id === $subuser->user->id)
+                    ->successNotificationTitle(null)
+                    ->action(function (Subuser $subuser, SubuserDeletionService $subuserDeletionService) use ($server) {
+                        $subuserDeletionService->handle($subuser, $server);
+
+                        Notification::make()
+                            ->title(trans('server/user.notification_delete'))
+                            ->success()
+                            ->send();
+                    }),
                 EditAction::make()
                     ->label(trans('server/user.edit'))
                     ->hidden(fn (Subuser $subuser) => user()?->id === $subuser->user->id)
@@ -167,7 +179,7 @@ class SubuserResource extends Resource
                                     ])
                                     ->formatStateUsing(fn (Subuser $subuser) => $subuser->user->email),
                                 Actions::make([
-                                    Action::make('exclude_assignAll')
+                                    Action::make('assignAll')
                                         ->label(trans('server/user.assign_all'))
                                         ->action(function (Set $set) use ($permissionsArray) {
                                             $permissions = $permissionsArray;
@@ -202,19 +214,6 @@ class SubuserResource extends Resource
 
                         return $data;
                     }),
-                DeleteAction::make()
-                    ->label(trans('server/user.delete'))
-                    ->hidden(fn (Subuser $subuser) => user()?->id === $subuser->user->id)
-                    ->authorize(fn () => user()?->can(SubuserPermission::UserDelete, $server))
-                    ->successNotificationTitle(null)
-                    ->action(function (Subuser $subuser, SubuserDeletionService $subuserDeletionService) use ($server) {
-                        $subuserDeletionService->handle($subuser, $server);
-
-                        Notification::make()
-                            ->title(trans('server/user.notification_delete'))
-                            ->success()
-                            ->send();
-                    }),
             ])
             ->toolbarActions([
                 CreateAction::make('invite')
@@ -244,7 +243,7 @@ class SubuserResource extends Resource
                                     ])
                                     ->required(),
                                 Actions::make([
-                                    Action::make('exclude_assignAll')
+                                    Action::make('assignAll')
                                         ->label(trans('server/user.assign_all'))
                                         ->action(function (Set $set, Get $get) use ($permissionsArray) {
                                             $permissions = $permissionsArray;

app/Http/Controllers/Api/Application/Plugins/PluginController.php

@@ -1,203 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api\Application\Plugins;
-
-use App\Enums\PluginStatus;
-use App\Exceptions\PanelException;
-use App\Http\Controllers\Api\Application\ApplicationApiController;
-use App\Http\Requests\Api\Application\Plugins\ImportFilePluginRequest;
-use App\Http\Requests\Api\Application\Plugins\ReadPluginRequest;
-use App\Http\Requests\Api\Application\Plugins\UninstallPluginRequest;
-use App\Http\Requests\Api\Application\Plugins\WritePluginRequest;
-use App\Models\Plugin;
-use App\Services\Helpers\PluginService;
-use App\Transformers\Api\Application\PluginTransformer;
-use Exception;
-use Illuminate\Http\Response;
-use Spatie\QueryBuilder\QueryBuilder;
-
-class PluginController extends ApplicationApiController
-{
-    /**
-     * PluginController constructor.
-     */
-    public function __construct(private readonly PluginService $pluginService)
-    {
-        parent::__construct();
-    }
-
-    /**
-     * List plugins
-     *
-     * Return all plugins on the Panel.
-     *
-     * @return array<array-key, mixed>
-     */
-    public function index(ReadPluginRequest $request): array
-    {
-        $plugins = QueryBuilder::for(Plugin::class)
-            ->allowedFilters(['id', 'name', 'author', 'category'])
-            ->allowedSorts(['id', 'name', 'author', 'category'])
-            ->paginate($request->query('per_page') ?? 10);
-
-        return $this->fractal->collection($plugins)
-            ->transformWith($this->getTransformer(PluginTransformer::class))
-            ->toArray();
-    }
-
-    /**
-     * View plugin
-     *
-     * Return a single plugin.
-     *
-     * @return array<array-key, mixed>
-     */
-    public function view(ReadPluginRequest $request, Plugin $plugin): array
-    {
-        return $this->fractal->item($plugin)
-            ->transformWith($this->getTransformer(PluginTransformer::class))
-            ->toArray();
-    }
-
-    /**
-     * Import plugin (file)
-     *
-     * Imports a new plugin file.
-     *
-     * @throws Exception
-     */
-    public function importFile(WritePluginRequest $request): Response
-    {
-        if (!$request->hasFile('plugin')) {
-            throw new PanelException("No 'plugin' file in request");
-        }
-
-        $this->pluginService->downloadPluginFromFile($request->file('plugin'));
-
-        return new Response('', Response::HTTP_CREATED);
-    }
-
-    /**
-     * Import plugin (url)
-     *
-     * Imports a new plugin from an url.
-     *
-     * @throws Exception
-     */
-    public function importUrl(ImportFilePluginRequest $request): Response
-    {
-        $this->pluginService->downloadPluginFromUrl($request->input('url'));
-
-        return new Response('', Response::HTTP_CREATED);
-    }
-
-    /**
-     * Install plugin
-     *
-     * Installs and enables a plugin.
-     *
-     * @return array<array-key, mixed>
-     *
-     * @throws Exception
-     */
-    public function install(WritePluginRequest $request, Plugin $plugin): array
-    {
-        if ($plugin->status !== PluginStatus::NotInstalled) {
-            throw new PanelException('Plugin is already installed');
-        }
-
-        $this->pluginService->installPlugin($plugin);
-
-        return $this->fractal->item($plugin)
-            ->transformWith($this->getTransformer(PluginTransformer::class))
-            ->toArray();
-    }
-
-    /**
-     * Update plugin
-     *
-     * Downloads and installs an update for a plugin. Will throw if no update is available.
-     *
-     * @return array<array-key, mixed>
-     *
-     * @throws Exception
-     */
-    public function update(WritePluginRequest $request, Plugin $plugin): array
-    {
-        if (!$plugin->isUpdateAvailable()) {
-            throw new PanelException("Plugin doesn't need updating");
-        }
-
-        $this->pluginService->updatePlugin($plugin);
-
-        return $this->fractal->item($plugin)
-            ->transformWith($this->getTransformer(PluginTransformer::class))
-            ->toArray();
-    }
-
-    /**
-     * Uninstall plugin
-     *
-     * Uninstalls a plugin. Optionally it will delete the plugin folder too.
-     *
-     * @return array<array-key, mixed>
-     *
-     * @throws Exception
-     */
-    public function uninstall(UninstallPluginRequest $request, Plugin $plugin): array
-    {
-        if ($plugin->status === PluginStatus::NotInstalled) {
-            throw new PanelException('Plugin is not installed');
-        }
-
-        $this->pluginService->uninstallPlugin($plugin, $request->boolean('delete'));
-
-        return $this->fractal->item($plugin)
-            ->transformWith($this->getTransformer(PluginTransformer::class))
-            ->toArray();
-    }
-
-    /**
-     * Enable plugin
-     *
-     * Enables a plugin.
-     *
-     * @return array<array-key, mixed>
-     *
-     * @throws Exception
-     */
-    public function enable(WritePluginRequest $request, Plugin $plugin): array
-    {
-        if (!$plugin->canEnable()) {
-            throw new PanelException("Plugin can't be enabled");
-        }
-
-        $this->pluginService->enablePlugin($plugin);
-
-        return $this->fractal->item($plugin)
-            ->transformWith($this->getTransformer(PluginTransformer::class))
-            ->toArray();
-    }
-
-    /**
-     * Disable plugin
-     *
-     * Disables a plugin.
-     *
-     * @return array<array-key, mixed>
-     *
-     * @throws Exception
-     */
-    public function disable(WritePluginRequest $request, Plugin $plugin): array
-    {
-        if (!$plugin->canDisable()) {
-            throw new PanelException("Plugin can't be disabled");
-        }
-
-        $this->pluginService->disablePlugin($plugin);
-
-        return $this->fractal->item($plugin)
-            ->transformWith($this->getTransformer(PluginTransformer::class))
-            ->toArray();
-    }
-}

app/Http/Controllers/Api/Application/Servers/ServerConfigController.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace App\Http\Controllers\Api\Application\Servers;
+
+use App\Exceptions\Service\InvalidFileUploadException;
+use App\Http\Controllers\Api\Application\ApplicationApiController;
+use App\Http\Requests\Api\Application\Servers\GetServerRequest;
+use App\Models\Server;
+use App\Services\Servers\Sharing\ServerConfigCreatorService;
+use App\Services\Servers\Sharing\ServerConfigExporterService;
+use App\Transformers\Api\Application\ServerTransformer;
+use Dedoc\Scramble\Attributes\Group;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+
+#[Group('Server Config', weight: 1)]
+class ServerConfigController extends ApplicationApiController
+{
+    public function __construct(
+        private ServerConfigExporterService $exporterService,
+        private ServerConfigCreatorService $creatorService
+    ) {
+        parent::__construct();
+    }
+
+    /**
+     * Export server configuration
+     *
+     * Export a server's configuration to YAML format. Returns the configuration as a
+     * downloadable YAML file containing settings, limits, allocations, and variable values.
+     */
+    public function export(GetServerRequest $request, Server $server): Response
+    {
+        $options = [
+            'include_description' => $request->boolean('include_description', true),
+            'include_allocations' => $request->boolean('include_allocations', true),
+            'include_variable_values' => $request->boolean('include_variable_values', true),
+        ];
+
+        $yaml = $this->exporterService->handle($server, $options);
+
+        $filename = 'server-config-' . str($server->name)->kebab()->lower()->trim() . '.yaml';
+
+        return response($yaml, 200, [
+            'Content-Type' => 'application/x-yaml',
+            'Content-Disposition' => 'attachment; filename="' . $filename . '"',
+        ]);
+    }
+
+    /**
+     * Create server from configuration
+     *
+     * Create a new server from a YAML configuration file. The configuration must
+     * include a valid egg UUID that exists in the system. Optionally specify a
+     * node_id to create the server on a specific node.
+     *
+     * @throws InvalidFileUploadException
+     */
+    public function create(Request $request): JsonResponse
+    {
+        $request->validate([
+            'file' => 'required|file|mimes:yaml,yml|max:1024',
+            'node_id' => 'required|integer|exists:nodes,id',
+        ]);
+
+        $file = $request->file('file');
+        $nodeId = $request->input('node_id');
+
+        $server = $this->creatorService->fromFile($file, $nodeId);
+
+        return $this->fractal->item($server)
+            ->transformWith($this->getTransformer(ServerTransformer::class))
+            ->respond(201);
+    }
+}

app/Http/Controllers/Api/Client/AccountController.php

@@ -13,17 +13,10 @@ use Illuminate\Auth\SessionGuard;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
-use Illuminate\Support\Facades\RateLimiter;
-use Symfony\Component\HttpKernel\Exception\TooManyRequestsHttpException;
 use Throwable;
 
 class AccountController extends ClientApiController
 {
-    /**
-     * The number of seconds that must elapse before the email change throttle resets.
-     */
-    private const EMAIL_UPDATE_THROTTLE = 60 * 60 * 24;
-
     /**
      * AccountController constructor.
      */
@@ -70,22 +63,10 @@ class AccountController extends ClientApiController
      */
     public function updateEmail(UpdateEmailRequest $request): JsonResponse
     {
-        $user = $request->user();
-
-        // Only allow a user to change their email three times in the span
-        // of 24 hours. This prevents malicious users from trying to find
-        // existing accounts in the system by constantly changing their email.
-        if (RateLimiter::tooManyAttempts($key = "user:update-email:{$user->uuid}", 3)) {
-            throw new TooManyRequestsHttpException(message: 'Your email address has been changed too many times today. Please try again later.');
-        }
-
-        $original = $user->email;
-
-        if (mb_strtolower($original) !== mb_strtolower($request->validated('email'))) {
-            RateLimiter::hit($key, self::EMAIL_UPDATE_THROTTLE);
-
-            $this->updateService->handle($user, $request->validated());
+        $original = $request->user()->email;
+        $this->updateService->handle($request->user(), $request->validated());
 
+        if ($original !== $request->input('email')) {
             Activity::event('user:account.email-changed')
                 ->property(['old' => $original, 'new' => $request->input('email')])
                 ->log();
@@ -104,9 +85,7 @@ class AccountController extends ClientApiController
      */
     public function updatePassword(UpdatePasswordRequest $request): JsonResponse
     {
-        $user = Activity::event('user:account.password-changed')->transaction(function () use ($request) {
-            return $this->updateService->handle($request->user(), $request->validated());
-        });
+        $user = $this->updateService->handle($request->user(), $request->validated());
 
         $guard = $this->manager->guard();
         // If you do not update the user in the session you'll end up working with a
@@ -119,6 +98,8 @@ class AccountController extends ClientApiController
             $guard->logoutOtherDevices($request->input('password'));
         }
 
+        Activity::event('user:account.password-changed')->log();
+
         return new JsonResponse([], Response::HTTP_NO_CONTENT);
     }
 }

app/Http/Controllers/Api/Client/Servers/BackupController.php

@@ -4,7 +4,6 @@ namespace App\Http\Controllers\Api\Client\Servers;
 
 use App\Enums\ServerState;
 use App\Enums\SubuserPermission;
-use App\Extensions\BackupAdapter\BackupAdapterService;
 use App\Facades\Activity;
 use App\Http\Controllers\Api\Client\ClientApiController;
 use App\Http\Requests\Api\Client\Servers\Backups\RenameBackupRequest;
@@ -34,7 +33,6 @@ class BackupController extends ClientApiController
         private readonly DeleteBackupService $deleteBackupService,
         private readonly InitiateBackupService $initiateBackupService,
         private readonly DownloadLinkService $downloadLinkService,
-        private readonly BackupAdapterService $backupService
     ) {
         parent::__construct();
     }
@@ -89,7 +87,7 @@ class BackupController extends ClientApiController
         }
 
         $backup = Activity::event('server:backup.start')->transaction(function ($log) use ($action, $server, $request) {
-            $server->backups()->lockForUpdate()->count();
+            $server->backups()->lockForUpdate();
 
             $backup = $action->handle($server, $request->input('name'));
 
@@ -193,8 +191,7 @@ class BackupController extends ClientApiController
             throw new AuthorizationException();
         }
 
-        $schema = $this->backupService->get($backup->backupHost->schema);
-        if (!$schema) {
+        if ($backup->disk !== Backup::ADAPTER_AWS_S3 && $backup->disk !== Backup::ADAPTER_DAEMON) {
             throw new BadRequestHttpException('The backup requested references an unknown disk driver type and cannot be downloaded.');
         }
 
@@ -267,13 +264,17 @@ class BackupController extends ClientApiController
             ->property(['name' => $backup->name, 'truncate' => $request->input('truncate')]);
 
         $log->transaction(function () use ($backup, $server, $request) {
-            $url = $this->downloadLinkService->handle($backup, $request->user());
+            // If the backup is for an S3 file we need to generate a unique Download link for
+            // it that will allow daemon to actually access the file.
+            if ($backup->disk === Backup::ADAPTER_AWS_S3) {
+                $url = $this->downloadLinkService->handle($backup, $request->user());
+            }
 
             // Update the status right away for the server so that we know not to allow certain
             // actions against it via the Panel API.
             $server->update(['status' => ServerState::RestoringBackup]);
 
-            $this->daemonRepository->setServer($server)->restore($backup, $url, $request->input('truncate'));
+            $this->daemonRepository->setServer($server)->restore($backup, $url ?? null, $request->input('truncate'));
         });
 
         return new JsonResponse([], JsonResponse::HTTP_NO_CONTENT);

app/Http/Controllers/Api/Client/Servers/DatabaseController.php

@@ -60,7 +60,7 @@ class DatabaseController extends ClientApiController
     public function store(StoreDatabaseRequest $request, Server $server): array
     {
         $database = Activity::event('server:database.create')->transaction(function ($log) use ($request, $server) {
-            $server->databases()->lockForUpdate()->count();
+            $server->databases()->lockForUpdate();
 
             $database = $this->deployDatabaseService->handle($server, $request->validated());
 
@@ -87,12 +87,15 @@ class DatabaseController extends ClientApiController
      */
     public function rotatePassword(RotatePasswordRequest $request, Server $server, Database $database): array
     {
+        $this->managementService->rotatePassword($database);
+        $database->refresh();
+
         Activity::event('server:database.rotate-password')
             ->subject($database)
             ->property('name', $database->database)
-            ->transaction(fn () => $this->managementService->rotatePassword($database));
+            ->log();
 
-        return $this->fractal->item($database->refresh())
+        return $this->fractal->item($database)
             ->parseIncludes(['password'])
             ->transformWith($this->getTransformer(DatabaseTransformer::class))
             ->toArray();

app/Http/Controllers/Api/Client/Servers/FileController.php

@@ -77,7 +77,7 @@ class FileController extends ClientApiController
             ->property('file', $request->get('file'))
             ->log();
 
-        return new Response(convert_to_utf8($response), Response::HTTP_OK, ['Content-Type' => 'text/plain; charset=utf-8']);
+        return new Response($response, Response::HTTP_OK, ['Content-Type' => 'text/plain']);
     }
 
     /**

app/Http/Controllers/Api/Client/Servers/StartupController.php

@@ -87,13 +87,13 @@ class StartupController extends ClientApiController
 
         $startup = $this->startupCommandService->handle($server);
 
-        if ($original !== $request->input('value')) {
+        if ($variable->env_variable !== $request->input('value')) {
             Activity::event('server:startup.edit')
                 ->subject($variable)
                 ->property([
                     'variable' => $variable->env_variable,
                     'old' => $original,
-                    'new' => $request->input('value') ?? '',
+                    'new' => $request->input('value'),
                 ])
                 ->log();
         }

app/Http/Controllers/Api/Remote/Backups/BackupRemoteUploadController.php

@@ -3,16 +3,20 @@
 namespace App\Http\Controllers\Api\Remote\Backups;
 
 use App\Exceptions\Http\HttpForbiddenException;
-use App\Extensions\BackupAdapter\BackupAdapterService;
-use App\Extensions\BackupAdapter\Schemas\S3BackupSchema;
+use App\Extensions\Backups\BackupManager;
+use App\Extensions\Filesystem\S3Filesystem;
 use App\Http\Controllers\Controller;
 use App\Models\Backup;
 use App\Models\Node;
+use App\Models\Server;
+use Carbon\CarbonImmutable;
+use Exception;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\HttpKernel\Exception\ConflictHttpException;
+use Throwable;
 
 class BackupRemoteUploadController extends Controller
 {
@@ -21,45 +25,117 @@ class BackupRemoteUploadController extends Controller
     /**
      * BackupRemoteUploadController constructor.
      */
-    public function __construct(private BackupAdapterService $backupService) {}
+    public function __construct(private BackupManager $backupManager) {}
 
     /**
      * Returns the required presigned urls to upload a backup to S3 cloud storage.
      *
-     * @throws BadRequestHttpException
+     * @throws Exception
+     * @throws Throwable
      * @throws ModelNotFoundException
-     * @throws HttpForbiddenException
-     * @throws ConflictHttpException
      */
     public function __invoke(Request $request, string $backup): JsonResponse
     {
+        // Get the node associated with the request.
         /** @var Node $node */
         $node = $request->attributes->get('node');
 
+        // Get the size query parameter.
         $size = (int) $request->query('size');
         if (empty($size)) {
             throw new BadRequestHttpException('A non-empty "size" query parameter must be provided.');
         }
 
-        $backup = Backup::where('uuid', $backup)->firstOrFail();
+        /** @var Backup $model */
+        $model = Backup::query()
+            ->where('uuid', $backup)
+            ->firstOrFail();
 
         // Check that the backup is "owned" by the node making the request. This avoids other nodes
         // from messing with backups that they don't own.
-        if ($backup->server->node_id !== $node->id) {
-            throw new HttpForbiddenException('Requesting node does not have permission to access this server.');
+        /** @var Server $server */
+        $server = $model->server;
+        if ($server->node_id !== $node->id) {
+            throw new HttpForbiddenException('You do not have permission to access that backup.');
         }
 
-        // Prevent backups that have already been completed from trying to be uploaded again.
-        if (!is_null($backup->completed_at)) {
+        // Prevent backups that have already been completed from trying to
+        // be uploaded again.
+        if (!is_null($model->completed_at)) {
             throw new ConflictHttpException('This backup is already in a completed state.');
         }
 
-        // Ensure we are using the S3 schema.
-        $schema = $this->backupService->get($backup->backupHost->schema);
-        if (!$schema instanceof S3BackupSchema) {
-            throw new BadRequestHttpException('The configured backup schema is not an S3 compatible.');
+        // Ensure we are using the S3 adapter.
+        $adapter = $this->backupManager->adapter();
+        if (!$adapter instanceof S3Filesystem) {
+            throw new BadRequestHttpException('The configured backup adapter is not an S3 compatible adapter.');
         }
 
-        return new JsonResponse($schema->getUploadParts($backup, $size));
+        // The path where backup will be uploaded to
+        $path = sprintf('%s/%s.tar.gz', $model->server->uuid, $model->uuid);
+
+        // Get the S3 client
+        $client = $adapter->getClient();
+        $expires = CarbonImmutable::now()->addMinutes(config('backups.presigned_url_lifespan', 60));
+
+        // Params for generating the presigned urls
+        $params = [
+            'Bucket' => $adapter->getBucket(),
+            'Key' => $path,
+            'ContentType' => 'application/x-gzip',
+        ];
+
+        $storageClass = config('backups.disks.s3.storage_class');
+        if (!is_null($storageClass)) {
+            $params['StorageClass'] = $storageClass;
+        }
+
+        // Execute the CreateMultipartUpload request
+        $result = $client->execute($client->getCommand('CreateMultipartUpload', $params));
+
+        // Get the UploadId from the CreateMultipartUpload request, this is needed to create
+        // the other presigned urls.
+        $params['UploadId'] = $result->get('UploadId');
+
+        // Retrieve configured part size
+        $maxPartSize = $this->getConfiguredMaxPartSize();
+
+        // Create as many UploadPart presigned urls as needed
+        $parts = [];
+        for ($i = 0; $i < ($size / $maxPartSize); $i++) {
+            $parts[] = $client->createPresignedRequest(
+                $client->getCommand('UploadPart', array_merge($params, ['PartNumber' => $i + 1])),
+                $expires
+            )->getUri()->__toString();
+        }
+
+        // Set the upload_id on the backup in the database.
+        $model->update(['upload_id' => $params['UploadId']]);
+
+        return new JsonResponse([
+            'parts' => $parts,
+            'part_size' => $maxPartSize,
+        ]);
+    }
+
+    /**
+     * Get the configured maximum size of a single part in the multipart upload.
+     *
+     * The function tries to retrieve a configured value from the configuration.
+     * If no value is specified, a fallback value will be used.
+     *
+     * Note if the received config cannot be converted to int (0), is zero or is negative,
+     * the fallback value will be used too.
+     *
+     * The fallback value is {@see BackupRemoteUploadController::DEFAULT_MAX_PART_SIZE}.
+     */
+    private function getConfiguredMaxPartSize(): int
+    {
+        $maxPartSize = config('backups.max_part_size', self::DEFAULT_MAX_PART_SIZE);
+        if ($maxPartSize <= 0) {
+            $maxPartSize = self::DEFAULT_MAX_PART_SIZE;
+        }
+
+        return $maxPartSize;
     }
 }

app/Http/Controllers/Api/Remote/Backups/BackupStatusController.php

@@ -2,9 +2,10 @@
 
 namespace App\Http\Controllers\Api\Remote\Backups;
 
+use App\Exceptions\DisplayException;
 use App\Exceptions\Http\HttpForbiddenException;
-use App\Extensions\BackupAdapter\BackupAdapterService;
-use App\Extensions\BackupAdapter\Schemas\S3BackupSchema;
+use App\Extensions\Backups\BackupManager;
+use App\Extensions\Filesystem\S3Filesystem;
 use App\Facades\Activity;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Api\Remote\ReportBackupCompleteRequest;
@@ -12,6 +13,7 @@ use App\Models\Backup;
 use App\Models\Node;
 use App\Models\Server;
 use Carbon\CarbonImmutable;
+use Exception;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
@@ -22,7 +24,7 @@ class BackupStatusController extends Controller
     /**
      * BackupStatusController constructor.
      */
-    public function __construct(private BackupAdapterService $backupService) {}
+    public function __construct(private BackupManager $backupManager) {}
 
     /**
      * Handles updating the state of a backup.
@@ -45,7 +47,7 @@ class BackupStatusController extends Controller
         /** @var Server $server */
         $server = $model->server;
         if ($server->node_id !== $node->id) {
-            throw new HttpForbiddenException('Requesting node does not have permission to access this server.');
+            throw new HttpForbiddenException('You do not have permission to access that backup.');
         }
 
         if ($model->is_successful) {
@@ -71,9 +73,9 @@ class BackupStatusController extends Controller
 
             // Check if we are using the s3 backup adapter. If so, make sure we mark the backup as
             // being completed in S3 correctly.
-            $schema = $this->backupService->get($model->backupHost->schema);
-            if ($schema instanceof S3BackupSchema) {
-                $schema->completeMultipartUpload($model, $successful, $request->input('parts'));
+            $adapter = $this->backupManager->adapter();
+            if ($adapter instanceof S3Filesystem) {
+                $this->completeMultipartUpload($model, $adapter, $successful, $request->input('parts'));
             }
         });
 
@@ -95,11 +97,6 @@ class BackupStatusController extends Controller
         /** @var Backup $model */
         $model = Backup::query()->where('uuid', $backup)->firstOrFail();
 
-        $node = $request->attributes->get('node');
-        if (!$model->server->node->is($node)) {
-            throw new HttpForbiddenException('Requesting node does not have permission to access this server.');
-        }
-
         $model->server->update(['status' => null]);
 
         Activity::event($request->boolean('successful') ? 'server:backup.restore-complete' : 'server.backup.restore-failed')
@@ -109,4 +106,59 @@ class BackupStatusController extends Controller
 
         return new JsonResponse([], JsonResponse::HTTP_NO_CONTENT);
     }
+
+    /**
+     * Marks a multipart upload in a given S3-compatible instance as failed or successful for the given backup.
+     *
+     * @param  ?array<array{int, etag: string, part_number: string}>  $parts
+     *
+     * @throws Exception
+     * @throws DisplayException
+     */
+    protected function completeMultipartUpload(Backup $backup, S3Filesystem $adapter, bool $successful, ?array $parts): void
+    {
+        // This should never really happen, but if it does don't let us fall victim to Amazon's
+        // wildly fun error messaging. Just stop the process right here.
+        if (empty($backup->upload_id)) {
+            // A failed backup doesn't need to error here, this can happen if the backup encounters
+            // an error before we even start the upload. AWS gives you tooling to clear these failed
+            // multipart uploads as needed too.
+            if (!$successful) {
+                return;
+            }
+
+            throw new DisplayException('Cannot complete backup request: no upload_id present on model.');
+        }
+
+        $params = [
+            'Bucket' => $adapter->getBucket(),
+            'Key' => sprintf('%s/%s.tar.gz', $backup->server->uuid, $backup->uuid),
+            'UploadId' => $backup->upload_id,
+        ];
+
+        $client = $adapter->getClient();
+        if (!$successful) {
+            $client->execute($client->getCommand('AbortMultipartUpload', $params));
+
+            return;
+        }
+
+        // Otherwise send a CompleteMultipartUpload request.
+        $params['MultipartUpload'] = [
+            'Parts' => [],
+        ];
+
+        if (is_null($parts)) {
+            $params['MultipartUpload']['Parts'] = $client->execute($client->getCommand('ListParts', $params))['Parts'];
+        } else {
+            foreach ($parts as $part) {
+                $params['MultipartUpload']['Parts'][] = [
+                    'ETag' => $part['etag'],
+                    'PartNumber' => $part['part_number'],
+                ];
+            }
+        }
+
+        $client->execute($client->getCommand('CompleteMultipartUpload', $params));
+    }
 }

app/Http/Controllers/Api/Remote/Servers/ServerContainersController.php

@@ -3,23 +3,18 @@
 namespace App\Http\Controllers\Api\Remote\Servers;
 
 use App\Enums\ContainerStatus;
-use App\Exceptions\Http\HttpForbiddenException;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\Api\Remote\ServerRequest;
 use App\Models\Server;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 
 class ServerContainersController extends Controller
 {
     /**
      * Updates the server container's status on the Panel
      */
-    public function status(Request $request, Server $server): JsonResponse
+    public function status(ServerRequest $request, Server $server): JsonResponse
     {
-        if (!$server->node->is($request->attributes->get('node'))) {
-            throw new HttpForbiddenException('Requesting node does not have permission to access this server.');
-        }
-
         $status = ContainerStatus::tryFrom($request->json('data.new_state')) ?? ContainerStatus::Missing;
 
         cache()->put("servers.$server->uuid.status", $status, now()->addHour());

app/Http/Controllers/Api/Remote/Servers/ServerDetailsController.php

@@ -3,9 +3,9 @@
 namespace App\Http\Controllers\Api\Remote\Servers;
 
 use App\Enums\ServerState;
-use App\Exceptions\Http\HttpForbiddenException;
 use App\Facades\Activity;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\Api\Remote\ServerRequest;
 use App\Http\Resources\Daemon\ServerConfigurationCollection;
 use App\Models\ActivityLog;
 use App\Models\Backup;
@@ -17,7 +17,6 @@ use Illuminate\Database\ConnectionInterface;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Throwable;
-use Webmozart\Assert\Assert;
 
 class ServerDetailsController extends Controller
 {
@@ -34,21 +33,8 @@ class ServerDetailsController extends Controller
      * Returns details about the server that allows daemon to self-recover and ensure
      * that the state of the server matches the Panel at all times.
      */
-    public function __invoke(Request $request, Server $server): JsonResponse
+    public function __invoke(ServerRequest $request, Server $server): JsonResponse
     {
-        Assert::isInstanceOf($node = $request->attributes->get('node'), Node::class);
-
-        $transfer = $server->transfer;
-
-        // If the server is being transferred allow either node to request information about
-        // the server. If the server is not being transferred only the target node is allowed
-        // to fetch these details.
-        $valid = $transfer ? $node->id === $transfer->old_node || $node->id === $transfer->new_node : $node->id === $server->node_id;
-
-        if (!$valid) {
-            throw new HttpForbiddenException('Requesting node does not have permission to access this server.');
-        }
-
         return new JsonResponse([
             'settings' => $this->configurationStructureService->handle($server),
             'process_configuration' => $this->eggConfigurationService->handle($server),

app/Http/Controllers/Api/Remote/Servers/ServerInstallController.php

@@ -4,13 +4,12 @@ namespace App\Http\Controllers\Api\Remote\Servers;
 
 use App\Enums\ServerState;
 use App\Events\Server\Installed as ServerInstalled;
-use App\Exceptions\Http\HttpForbiddenException;
 use App\Exceptions\Model\DataValidationException;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Api\Remote\InstallationDataRequest;
+use App\Http\Requests\Api\Remote\ServerRequest;
 use App\Models\Server;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 
 class ServerInstallController extends Controller
@@ -18,18 +17,12 @@ class ServerInstallController extends Controller
     /**
      * Returns installation information for a server.
      */
-    public function index(Request $request, Server $server): JsonResponse
+    public function index(ServerRequest $request, Server $server): JsonResponse
     {
-        if (!$server->node->is($request->attributes->get('node'))) {
-            throw new HttpForbiddenException('Requesting node does not have permission to access this server.');
-        }
-
-        $egg = $server->egg;
-
         return new JsonResponse([
-            'container_image' => $egg->copy_script_container,
-            'entrypoint' => $egg->copy_script_entry,
-            'script' => $egg->copy_script_install,
+            'container_image' => $server->egg->copy_script_container,
+            'entrypoint' => $server->egg->copy_script_entry,
+            'script' => $server->egg->copy_script_install,
         ]);
     }
 
@@ -42,10 +35,6 @@ class ServerInstallController extends Controller
     {
         $status = null;
 
-        if (!$server->node->is($request->attributes->get('node'))) {
-            throw new HttpForbiddenException('Requesting node does not have permission to access this server.');
-        }
-
         $successful = $request->boolean('successful');
 
         // Make sure the type of failure is accurate

app/Http/Controllers/Api/Remote/Servers/ServerTransferController.php

@@ -2,20 +2,17 @@
 
 namespace App\Http\Controllers\Api\Remote\Servers;
 
-use App\Exceptions\Http\HttpForbiddenException;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\Api\Remote\ServerRequest;
 use App\Models\Allocation;
-use App\Models\Node;
 use App\Models\Server;
 use App\Repositories\Daemon\DaemonServerRepository;
 use Illuminate\Database\ConnectionInterface;
 use Illuminate\Http\Client\ConnectionException;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Symfony\Component\HttpKernel\Exception\ConflictHttpException;
 use Throwable;
-use Webmozart\Assert\Assert;
 
 class ServerTransferController extends Controller
 {
@@ -32,22 +29,13 @@ class ServerTransferController extends Controller
      *
      * @throws Throwable
      */
-    public function failure(Request $request, Server $server): JsonResponse
+    public function failure(ServerRequest $request, Server $server): JsonResponse
     {
         $transfer = $server->transfer;
         if (is_null($transfer)) {
             throw new ConflictHttpException('Server is not being transferred.');
         }
 
-        /* @var Node $node */
-        Assert::isInstanceOf($node = $request->attributes->get('node'), Node::class);
-
-        // Either node can tell the panel that the transfer has failed. Only the new node
-        // can tell the panel that it was successful.
-        if (!$node->is($transfer->newNode) && !$node->is($transfer->oldNode)) {
-            throw new HttpForbiddenException('Requesting node does not have permission to access this server.');
-        }
-
         $this->connection->transaction(function () use ($transfer) {
             $transfer->forceFill(['successful' => false])->saveOrFail();
 
@@ -65,22 +53,13 @@ class ServerTransferController extends Controller
      *
      * @throws Throwable
      */
-    public function success(Request $request, Server $server): JsonResponse
+    public function success(ServerRequest $request, Server $server): JsonResponse
     {
         $transfer = $server->transfer;
         if (is_null($transfer)) {
             throw new ConflictHttpException('Server is not being transferred.');
         }
 
-        /* @var Node $node */
-        Assert::isInstanceOf($node = $request->attributes->get('node'), Node::class);
-
-        // Only the new node communicates a successful state to the panel, so we should
-        // not allow the old node to hit this endpoint.
-        if (!$node->is($transfer->newNode)) {
-            throw new HttpForbiddenException('Requesting node does not have permission to access this server.');
-        }
-
         /** @var Server $server */
         $server = $this->connection->transaction(function () use ($server, $transfer) {
             $data = [];

app/Http/Controllers/Auth/OAuthController.php

@@ -74,7 +74,7 @@ class OAuthController extends Controller
         $email = $oauthUser->getEmail();
 
         if (!$email) {
-            return $this->errorRedirect('No email was linked to your account on the OAuth provider.');
+            return $this->errorRedirect();
         }
 
         $user = User::whereEmail($email)->first();

app/Http/Middleware/RequireTwoFactorAuthentication.php

@@ -23,7 +23,7 @@ class RequireTwoFactorAuthentication
      * order to perform actions. If so, we check the level at which it is required (all users
      * or just admins) and then check if the user has enabled it for their account.
      *
-     * @throws TwoFactorAuthRequiredException
+     * @throws \App\Exceptions\Http\TwoFactorAuthRequiredException
      */
     public function handle(Request $request, \Closure $next): mixed
     {

app/Http/Middleware/SetSecurityHeaders.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-
-class SetSecurityHeaders
-{
-    /**
-     * Ideally we move away from X-Frame-Options/X-XSS-Protection and implement a
-     * proper standard CSP, but I can guarantee that will break for a lot of folks
-     * using custom plugins and who knows what image embeds.
-     *
-     * We'll circle back to that at a later date when it can be more fully controlled
-     * by the admin to support those cases without too much trouble.
-     *
-     * @var array<string, string>
-     */
-    protected static array $headers = [
-        'X-Frame-Options' => 'DENY',
-        'X-Content-Type-Options' => 'nosniff',
-        'X-XSS-Protection' => '1; mode=block',
-        'Referrer-Policy' => 'no-referrer-when-downgrade',
-    ];
-
-    /**
-     * Enforces some basic security headers on all responses returned by the software.
-     * If a header has already been set in another location within the code it will be
-     * skipped over here.
-     *
-     * @param  (\Closure(mixed): Response)  $next
-     */
-    public function handle(Request $request, \Closure $next): mixed
-    {
-        $response = $next($request);
-
-        foreach (static::$headers as $key => $value) {
-            if (!$response->headers->has($key)) {
-                $response->headers->set($key, $value);
-            }
-        }
-
-        return $response;
-    }
-}

app/Http/Requests/Api/Application/ApplicationApiRequest.php

@@ -87,7 +87,7 @@ abstract class ApplicationApiRequest extends FormRequest
         $value = $this->route()->parameter($key);
 
         Assert::isInstanceOf($value, $expect);
-        Assert::isInstanceOf($value, Model::class); // @phpstan-ignore staticMethod.alreadyNarrowedType
+        Assert::isInstanceOf($value, Model::class);
         Assert::true($value->exists);
 
         /* @var T $value */

app/Http/Requests/Api/Application/Plugins/ImportFilePluginRequest.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Api\Application\Plugins;
-
-class ImportFilePluginRequest extends WritePluginRequest
-{
-    public function rules(): array
-    {
-        return [
-            'url' => 'required|string',
-        ];
-    }
-}

app/Http/Requests/Api/Application/Plugins/ReadPluginRequest.php

@@ -1,14 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Api\Application\Plugins;
-
-use App\Http\Requests\Api\Application\ApplicationApiRequest;
-use App\Models\Plugin;
-use App\Services\Acl\Api\AdminAcl;
-
-class ReadPluginRequest extends ApplicationApiRequest
-{
-    protected ?string $resource = Plugin::RESOURCE_NAME;
-
-    protected int $permission = AdminAcl::READ;
-}

app/Http/Requests/Api/Application/Plugins/UninstallPluginRequest.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Api\Application\Plugins;
-
-class UninstallPluginRequest extends WritePluginRequest
-{
-    /**
-     * @param  array<array-key, string|string[]>|null  $rules
-     * @return array<array-key, string|string[]>
-     */
-    public function rules(?array $rules = null): array
-    {
-        return [
-            'delete' => 'boolean',
-        ];
-    }
-}

app/Http/Requests/Api/Application/Plugins/WritePluginRequest.php

@@ -1,14 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Api\Application\Plugins;
-
-use App\Http\Requests\Api\Application\ApplicationApiRequest;
-use App\Models\Plugin;
-use App\Services\Acl\Api\AdminAcl;
-
-class WritePluginRequest extends ApplicationApiRequest
-{
-    protected ?string $resource = Plugin::RESOURCE_NAME;
-
-    protected int $permission = AdminAcl::WRITE;
-}

app/Http/Requests/Api/Remote/InstallationDataRequest.php

@@ -2,15 +2,8 @@
 
 namespace App\Http\Requests\Api\Remote;
 
-use Illuminate\Foundation\Http\FormRequest;
-
-class InstallationDataRequest extends FormRequest
+class InstallationDataRequest extends ServerRequest
 {
-    public function authorize(): bool
-    {
-        return true;
-    }
-
     /**
      * @return array<string, string|string[]>
      */

app/Http/Requests/Api/Remote/ServerRequest.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Requests\Api\Remote;
+
+use App\Models\Node;
+use App\Models\Server;
+use Illuminate\Foundation\Http\FormRequest;
+
+class ServerRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        /** @var Node $node */
+        $node = $this->attributes->get('node');
+
+        /** @var ?Server $server */
+        $server = $this->route()->parameter('server');
+
+        if ($server) {
+            if ($server->transfer) {
+                return $server->transfer->old_node === $node->id || $server->transfer->new_node === $node->id;
+            }
+
+            return $server->node_id === $node->id;
+        }
+
+        return false;
+    }
+}