Merge branch 'main' into lance/cloud

Co-authored-by: RMartinOscar <40749467+RMartinOscar@users.noreply.github.com>

.dockerignore

@@ -0,0 +1,29 @@
+**.DS_Store
+.env
+.devcontainer
+.dockerignore
+.editorconfig
+.git
+.github
+**.gitignore
+.php-cs-fixer.dist.php
+.prettierrc.json
+.vscode
+Dockerfile
+bounties.md
+compose.yml
+contributing.md
+contributor_license_agreement.md
+database/database.sqlite
+docker/README.md
+node_modules
+phpstan.neon
+phpunit.xml
+readme.md
+storage/debugbar/*.json
+storage/framework/cache/data/*
+storage/framework/sessions/*
+storage/framework/testing
+storage/framework/views/*.php
+storage/logs/*.log
+vendor

.env.example

@@ -1,37 +1,6 @@
 APP_ENV=production
 APP_DEBUG=false
 APP_KEY=
-APP_TIMEZONE=UTC
 APP_URL=http://panel.test
+APP_INSTALLED=false
 APP_LOCALE=en
-APP_ENVIRONMENT_ONLY=true
-
-LOG_CHANNEL=daily
-LOG_STACK=single
-LOG_DEPRECATIONS_CHANNEL=null
-LOG_LEVEL=debug
-
-DB_CONNECTION=sqlite
-
-CACHE_STORE=file
-QUEUE_CONNECTION=database
-SESSION_DRIVER=file
-
-MAIL_MAILER=log
-MAIL_HOST=smtp.example.com
-MAIL_PORT=25
-MAIL_USERNAME=
-MAIL_PASSWORD=
-MAIL_ENCRYPTION=tls
-MAIL_FROM_ADDRESS=no-reply@example.com
-MAIL_FROM_NAME="Pelican Admin"
-# Set this to your domain to prevent it defaulting to 'localhost', causing mail servers such as Gmail to reject your mail
-# MAIL_EHLO_DOMAIN=panel.example.com
-SESSION_ENCRYPT=false
-SESSION_PATH=/
-SESSION_DOMAIN=null
-
-# Set this to true, and set start & end ports to auto create allocations.
-PANEL_CLIENT_ALLOCATIONS_ENABLED=false
-PANEL_CLIENT_ALLOCATIONS_RANGE_START=
-PANEL_CLIENT_ALLOCATIONS_RANGE_END=

.eslintignore

@@ -1,6 +0,0 @@
-public
-node_modules
-resources/views
-babel.config.js
-tailwind.config.js
-webpack.config.js

.eslintrc.js

@@ -1,52 +0,0 @@
-/** @type {import('eslint').Linter.Config} */
-module.exports = {
-    parser: '@typescript-eslint/parser',
-    parserOptions: {
-        ecmaVersion: 6,
-        ecmaFeatures: {
-            jsx: true,
-        },
-        project: './tsconfig.json',
-        tsconfigRootDir: './',
-    },
-    settings: {
-        react: {
-            pragma: 'React',
-            version: 'detect',
-        },
-        linkComponents: [
-            { name: 'Link', linkAttribute: 'to' },
-            { name: 'NavLink', linkAttribute: 'to' },
-        ],
-    },
-    env: {
-        browser: true,
-        es6: true,
-    },
-    plugins: ['react', 'react-hooks', 'prettier', '@typescript-eslint'],
-    extends: [
-        // 'standard',
-        'eslint:recommended',
-        'plugin:react/recommended',
-        'plugin:@typescript-eslint/recommended',
-        'plugin:jest-dom/recommended',
-    ],
-    rules: {
-        eqeqeq: 'error',
-        'prettier/prettier': ['error', {}, { usePrettierrc: true }],
-        // TypeScript can infer this significantly better than eslint ever can.
-        'react/prop-types': 0,
-        'react/display-name': 0,
-        '@typescript-eslint/no-explicit-any': 0,
-        '@typescript-eslint/no-non-null-assertion': 0,
-        // 'react/no-unknown-property': ['error', { ignore: ['css'] }],
-        // This setup is required to avoid a spam of errors when running eslint about React being
-        // used before it is defined.
-        //
-        // @see https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/no-use-before-define.md#how-to-use
-        'no-use-before-define': 0,
-        '@typescript-eslint/no-use-before-define': 'warn',
-        '@typescript-eslint/no-unused-vars': ['warn', { argsIgnorePattern: '^_', varsIgnorePattern: '^_' }],
-        '@typescript-eslint/ban-ts-comment': ['error', { 'ts-expect-error': 'allow-with-description' }],
-    },
-};

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -33,7 +33,6 @@ body:
   attributes:
     label: Panel Version
     description: Version number of your Panel (latest is not a version)
-    placeholder: 1.4.0
   validations:
     required: true
 
@@ -42,7 +41,6 @@ body:
   attributes:
     label: Wings Version
     description: Version number of your Wings (latest is not a version)
-    placeholder: 1.4.2
   validations:
     required: true
 
@@ -68,7 +66,7 @@ body:
       Run the following command to collect logs on your system.
 
       Wings: `sudo wings diagnostics`
-      Panel: `tail -n 150 /var/www/pelican/storage/logs/laravel-$(date +%F).log | nc pelipaste.com 99`
+      Panel: `tail -n 150 /var/www/pelican/storage/logs/laravel-$(date +%F).log | curl -X POST -F 'c=@-' paste.pelistuff.com`
     placeholder: "https://pelipaste.com/a1h6z"
     render: bash
   validations:

.github/docker/README.md

@@ -1,76 +0,0 @@
-# Pelican Panel - Docker Image
-This is a ready to use docker image for the panel.
-
-## Requirements
-This docker image requires some additional software to function. The software can either be provided in other containers (see the [docker-compose.yml](https://github.com/pelican-dev/panel/blob/develop/docker-compose.example.yml) as an example) or as existing instances.
-
-A mysql database is required. We recommend the stock [MariaDB Image](https://hub.docker.com/_/mariadb/) image if you prefer to run it in a docker container. As a non-containerized option we recommend mariadb.
-
-A caching software is required as well. We recommend the stock [Redis Image](https://hub.docker.com/_/redis/) image. You can choose any of the [supported options](#cache-drivers).
-
-You can provide additional settings using a custom `.env` file or by setting the appropriate environment variables in the docker-compose file.
-
-## Setup
-
-Start the docker container and the required dependencies (either provide existing ones or start containers as well, see the [docker-compose.yml](https://github.com/pelican-dev/panel/blob/develop/docker-compose.example.yml) file as an example.
-
-After the startup is complete you'll need to create a user.
-If you are running the docker container without docker-compose, use:
-```
-docker exec -it <container id> php artisan p:user:make
-```
-If you are using docker compose use
-```
-docker-compose exec panel php artisan p:user:make
-```
-
-## Environment Variables
-There are multiple environment variables to configure the panel when not providing your own `.env` file, see the following table for details on each available option.
-
-Note: If your `APP_URL` starts with `https://` you need to provide an `LE_EMAIL` as well so Certificates can be generated.
-
-| Variable          | Description                                                                    | Required |
-|-------------------| ------------------------------------------------------------------------------ | -------- |
-| `APP_URL`         | The URL the panel will be reachable with (including protocol)                  | yes      |
-| `APP_TIMEZONE`    | The timezone to use for the panel                                              | yes      |
-| `LE_EMAIL`        | The email used for letsencrypt certificate generation                          | yes      |
-| `DB_HOST`         | The host of the mysql instance                                                 | yes      |
-| `DB_PORT`         | The port of the mysql instance                                                 | yes      |
-| `DB_DATABASE`     | The name of the mysql database                                                 | yes      |
-| `DB_USERNAME`     | The mysql user                                                                 | yes      |
-| `DB_PASSWORD`     | The mysql password for the specified user                                      | yes      |
-| `CACHE_STORE`     | The cache driver        (see [Cache drivers](#cache-drivers) for detais)       | yes      |
-| `SESSION_DRIVER`  |                                                                                | yes      |
-| `QUEUE_DRIVER`    |                                                                                | yes      |
-| `REDIS_HOST`      | The hostname or IP address of the redis database                               | yes      |
-| `REDIS_PASSWORD`  | The password used to secure the redis database                                 | maybe    |
-| `REDIS_PORT`      | The port the redis database is using on the host                               | maybe    |
-| `MAIL_DRIVER`     | The email driver (see [Mail drivers](#mail-drivers) for details)               | yes      |
-| `MAIL_FROM`       | The email that should be used as the sender email                              | yes      |
-| `MAIL_HOST`       | The host of your mail driver instance                                          | maybe    |
-| `MAIL_PORT`       | The port of your mail driver instance                                          | maybe    |
-| `MAIL_USERNAME`   | The username for your mail driver                                              | maybe    |
-| `MAIL_PASSWORD`   | The password for your mail driver                                              | maybe    |
-
-
-### Cache drivers
-You can choose between different cache drivers depending on what you prefer.
-We recommend redis when using docker as it can be started in a container easily.
-
-| Driver   | Description                          | Required variables                                     |
-| -------- | ------------------------------------ | ------------------------------------------------------ |
-| redis    | host where redis is running          | `REDIS_HOST`                                           |
-| redis    | port redis is running on             | `REDIS_PORT`                                           |
-| redis    | redis database password              | `REDIS_PASSWORD`                                       |
-
-### Mail drivers
-You can choose between different mail drivers according to your needs.
-Every driver requires `MAIL_FROM` to be set.
-
-| Driver   | Description                          | Required variables                                            |
-| -------- | ------------------------------------ | ------------------------------------------------------------- |
-| mail     | uses the installed php mail          |                                                               |
-| mandrill | [Mandrill](http://www.mandrill.com/) | `MAIL_USERNAME`                                               |
-| postmark | [Postmark](https://postmarkapp.com/) | `MAIL_USERNAME`                                               |
-| mailgun  | [Mailgun](https://www.mailgun.com/)  | `MAIL_USERNAME`, `MAIL_HOST`                                  |
-| smtp     | Any SMTP server can be configured    | `MAIL_USERNAME`, `MAIL_HOST`, `MAIL_PASSWORD`, `MAIL_PORT`    |

.github/docker/default.conf

@@ -1,75 +0,0 @@
-# If using Ubuntu this file should be placed in:
-# 			/etc/nginx/sites-available/
-#
-# If using CentOS this file should be placed in:
-#				 /etc/nginx/conf.d/
-#
-
-# The MIT License (MIT)
-#
-# Pterodactyl®
-# Copyright © Dane Everitt <dane@daneeveritt.com> and contributors
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-server {
-    listen 80;
-    server_name _;
-
-    root /app/public;
-    index index.html index.htm index.php;
-    charset utf-8;
-
-    location / {
-        try_files $uri $uri/ /index.php?$query_string;
-    }
-
-    location = /favicon.ico { access_log off; log_not_found off; }
-    location = /robots.txt  { access_log off; log_not_found off; }
-
-    access_log off;
-    error_log  /var/log/nginx/panel.app-error.log error;
-
-    # allow larger file uploads and longer script runtimes
-    client_max_body_size 100m;
-    client_body_timeout 120s;
-
-    sendfile off;
-
-    location ~ \.php$ {
-        fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        # the fastcgi_pass path needs to be changed accordingly when using CentOS
-        fastcgi_pass 127.0.0.1:9000;
-        fastcgi_index index.php;
-        include fastcgi_params;
-        fastcgi_param PHP_VALUE "upload_max_filesize = 100M \n post_max_size=100M";
-        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-        fastcgi_param HTTP_PROXY "";
-        fastcgi_intercept_errors off;
-        fastcgi_buffer_size 16k;
-        fastcgi_buffers 4 16k;
-        fastcgi_connect_timeout 300;
-        fastcgi_send_timeout 300;
-        fastcgi_read_timeout 300;
-    }
-
-    location ~ /\.ht {
-        deny all;
-    }
-}

.github/docker/default_ssl.conf

@@ -1,70 +0,0 @@
-# If using Ubuntu this file should be placed in:
-# 			/etc/nginx/sites-available/
-#
-server {
-    listen 80;
-    server_name <domain>;
-    return 301 https://$server_name$request_uri;
-}
-
-server {
-    listen 443 ssl http2;
-    server_name <domain>;
-
-    root /app/public;
-    index index.php;
-
-    access_log /var/log/nginx/panel.app-access.log;
-    error_log  /var/log/nginx/panel.app-error.log error;
-
-    # allow larger file uploads and longer script runtimes
-    client_max_body_size 100m;
-    client_body_timeout 120s;
-
-    sendfile off;
-
-    # strengthen ssl security
-    ssl_certificate /etc/letsencrypt/live/<domain>/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/<domain>/privkey.pem;
-    ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
-    ssl_prefer_server_ciphers on;
-    ssl_session_cache shared:SSL:10m;
-    ssl_ciphers "EECDH+AESGCM:EDH+AESGCM:ECDHE-RSA-AES128-GCM-SHA256:AES256+EECDH:DHE-RSA-AES128-GCM-SHA256:AES256+EDH:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4";
-
-    # See the link below for more SSL information:
-    #     https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html
-    #
-    # ssl_dhparam /etc/ssl/certs/dhparam.pem;
-
-    # Add headers to serve security related headers
-    add_header Strict-Transport-Security "max-age=15768000; preload;";
-    add_header X-Content-Type-Options nosniff;
-    add_header X-XSS-Protection "1; mode=block";
-    add_header X-Robots-Tag none;
-    add_header Content-Security-Policy "frame-ancestors 'self'";
-
-    location / {
-        try_files $uri $uri/ /index.php?$query_string;
-    }
-
-    location ~ \.php$ {
-        fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        fastcgi_pass 127.0.0.1:9000;
-        fastcgi_index index.php;
-        include fastcgi_params;
-        fastcgi_param PHP_VALUE "upload_max_filesize = 100M \n post_max_size=100M";
-        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-        fastcgi_param HTTP_PROXY "";
-        fastcgi_intercept_errors off;
-        fastcgi_buffer_size 16k;
-        fastcgi_buffers 4 16k;
-        fastcgi_connect_timeout 300;
-        fastcgi_send_timeout 300;
-        fastcgi_read_timeout 300;
-        include /etc/nginx/fastcgi_params;
-    }
-
-    location ~ /\.ht {
-        deny all;
-    }
-}

.github/docker/entrypoint.sh

@@ -1,81 +0,0 @@
-#!/bin/ash -e
-cd /app
-
-mkdir -p /var/log/panel/logs/ /var/log/supervisord/ /var/log/nginx/ /var/log/php8/ \
-  && chmod 777 /var/log/panel/logs/ \
-  && ln -s /app/storage/logs/ /var/log/panel/
-
-## check for .env file and generate app keys if missing
-if [ -f /app/var/.env ]; then
-  echo "external vars exist."
-  rm -rf /app/.env
-  ln -s /app/var/.env /app/
-else
-  echo "external vars don't exist."
-  rm -rf /app/.env
-  touch /app/var/.env
-
-  ## manually generate a key because key generate --force fails
-  if [ -z $APP_KEY ]; then
-     echo -e "Generating key."
-     APP_KEY=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)
-     echo -e "Generated app key: $APP_KEY"
-     echo -e "APP_KEY=$APP_KEY" > /app/var/.env
-  else
-    echo -e "APP_KEY exists in environment, using that."
-    echo -e "APP_KEY=$APP_KEY" > /app/var/.env
-  fi
-
-  ln -s /app/var/.env /app/
-fi
-
-echo "Checking if https is required."
-if [ -f /etc/nginx/http.d/panel.conf ]; then
-  echo "Using nginx config already in place."
-  if [ $LE_EMAIL ]; then
-    echo "Checking for cert update"
-    certbot certonly -d $(echo $APP_URL | sed 's~http[s]*://~~g')  --standalone -m $LE_EMAIL --agree-tos -n
-  else
-    echo "No letsencrypt email is set"
-  fi
-else
-  echo "Checking if letsencrypt email is set."
-  if [ -z $LE_EMAIL ]; then
-    echo "No letsencrypt email is set using http config."
-    cp .github/docker/default.conf /etc/nginx/http.d/panel.conf
-  else
-    echo "writing ssl config"
-    cp .github/docker/default_ssl.conf /etc/nginx/http.d/panel.conf
-    echo "updating ssl config for domain"
-    sed -i "s|<domain>|$(echo $APP_URL | sed 's~http[s]*://~~g')|g" /etc/nginx/http.d/panel.conf
-    echo "generating certs"
-    certbot certonly -d $(echo $APP_URL | sed 's~http[s]*://~~g')  --standalone -m $LE_EMAIL --agree-tos -n
-  fi
-  echo "Removing the default nginx config"
-  rm -rf /etc/nginx/http.d/default.conf
-fi
-
-if [[ -z $DB_PORT ]]; then
-  echo -e "DB_PORT not specified, defaulting to 3306"
-  DB_PORT=3306
-fi
-
-## check for DB up before starting the panel
-echo "Checking database status."
-until nc -z -v -w30 $DB_HOST $DB_PORT
-do
-  echo "Waiting for database connection..."
-  # wait for 1 seconds before check again
-  sleep 1
-done
-
-## make sure the db is set up
-echo -e "Migrating and Seeding D.B"
-php artisan migrate --seed --force
-
-## start cronjobs for the queue
-echo -e "Starting cron jobs."
-crond -L /var/log/crond -l 5
-
-echo -e "Starting supervisord."
-exec "$@"

.github/docker/www.conf

@@ -1,16 +0,0 @@
-[www]
-
-user = nginx
-group = nginx
-
-listen = 127.0.0.1:9000
-listen.owner = nginx
-listen.group = nginx
-listen.mode = 0750
-
-pm = ondemand
-pm.max_children = 9
-pm.process_idle_timeout = 10s
-pm.max_requests = 200
-
-clear_env = no

.github/workflows/build.yaml

@@ -1,9 +1,10 @@
 name: Build
 
 on:
-  pull_request:
+  push:
     branches:
-      - '**'
+      - main
+  pull_request:
 
 jobs:
   ui:
@@ -17,14 +18,25 @@ jobs:
       - name: Code Checkout
         uses: actions/checkout@v4
 
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
+          tools: composer:v2
+          coverage: none
+
+      - name: Install PHP dependencies
+        run: composer install --no-interaction --no-suggest --no-progress --no-autoloader --no-scripts --no-dev
+
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: "yarn"
 
-      - name: Install dependencies
+      - name: Install JS dependencies
         run: yarn install --frozen-lockfile
 
       - name: Build
-        run: yarn build:production
+        run: yarn build

.github/workflows/ci.yaml

@@ -1,9 +1,10 @@
 name: Tests
 
 on:
-  pull_request:
+  push:
     branches:
-      - '**'
+      - main
+  pull_request:
 
 jobs:
   mysql:
@@ -12,8 +13,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.2, 8.3]
-        database: ["mariadb:10.2", "mysql:8"]
+        php: [8.2, 8.3, 8.4]
+        database: ["mysql:8"]
     services:
       database:
         image: ${{ matrix.database }}
@@ -29,7 +30,6 @@ jobs:
       APP_KEY: ThisIsARandomStringForTests12345
       APP_TIMEZONE: UTC
       APP_URL: http://localhost/
-      APP_ENVIRONMENT_ONLY: "true"
       CACHE_DRIVER: array
       MAIL_MAILER: array
       SESSION_DRIVER: array
@@ -38,6 +38,8 @@ jobs:
       DB_HOST: 127.0.0.1
       DB_DATABASE: testing
       DB_USERNAME: root
+      GUZZLE_TIMEOUT: 60
+      GUZZLE_CONNECT_TIMEOUT: 60
     steps:
       - name: Code Checkout
         uses: actions/checkout@v4
@@ -59,21 +61,94 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: bcmath, cli, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
+          extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
           tools: composer:v2
           coverage: none
 
       - name: Install dependencies
-        run: composer install --no-interaction --no-suggest --prefer-dist
+        run: composer install --no-interaction --no-suggest --no-progress --no-scripts
 
       - name: Unit tests
-        run: vendor/bin/phpunit tests/Unit
+        run: vendor/bin/pest tests/Unit
         env:
           DB_HOST: UNIT_NO_DB
           SKIP_MIGRATIONS: true
 
       - name: Integration tests
-        run: vendor/bin/phpunit tests/Integration
+        run: vendor/bin/pest tests/Integration
+        env:
+          DB_PORT: ${{ job.services.database.ports[3306] }}
+          DB_USERNAME: root
+
+  mariadb:
+    name: MariaDB
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [8.2, 8.3, 8.4]
+        database: ["mariadb:10.6", "mariadb:10.11", "mariadb:11.4"]
+    services:
+      database:
+        image: ${{ matrix.database }}
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: yes
+          MYSQL_DATABASE: testing
+        ports:
+          - 3306
+        options: --health-cmd="mariadb-admin ping || mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+    env:
+      APP_ENV: testing
+      APP_DEBUG: "false"
+      APP_KEY: ThisIsARandomStringForTests12345
+      APP_TIMEZONE: UTC
+      APP_URL: http://localhost/
+      CACHE_DRIVER: array
+      MAIL_MAILER: array
+      SESSION_DRIVER: array
+      QUEUE_CONNECTION: sync
+      DB_CONNECTION: mariadb
+      DB_HOST: 127.0.0.1
+      DB_DATABASE: testing
+      DB_USERNAME: root
+      GUZZLE_TIMEOUT: 60
+      GUZZLE_CONNECT_TIMEOUT: 60
+    steps:
+      - name: Code Checkout
+        uses: actions/checkout@v4
+
+      - name: Get cache directory
+        id: composer-cache
+        run: |
+          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+      - name: Cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-${{ matrix.php }}-
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
+          tools: composer:v2
+          coverage: none
+
+      - name: Install dependencies
+        run: composer install --no-interaction --no-suggest --no-progress --no-scripts
+
+      - name: Unit tests
+        run: vendor/bin/pest tests/Unit
+        env:
+          DB_HOST: UNIT_NO_DB
+          SKIP_MIGRATIONS: true
+
+      - name: Integration tests
+        run: vendor/bin/pest tests/Integration
         env:
           DB_PORT: ${{ job.services.database.ports[3306] }}
           DB_USERNAME: root
@@ -84,20 +159,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.2, 8.3]
+        php: [8.2, 8.3, 8.4]
     env:
       APP_ENV: testing
       APP_DEBUG: "false"
       APP_KEY: ThisIsARandomStringForTests12345
       APP_TIMEZONE: UTC
       APP_URL: http://localhost/
-      APP_ENVIRONMENT_ONLY: "true"
       CACHE_DRIVER: array
       MAIL_MAILER: array
       SESSION_DRIVER: array
       QUEUE_CONNECTION: sync
       DB_CONNECTION: sqlite
       DB_DATABASE: testing.sqlite
+      GUZZLE_TIMEOUT: 60
+      GUZZLE_CONNECT_TIMEOUT: 60
     steps:
       - name: Code Checkout
         uses: actions/checkout@v4
@@ -119,21 +195,97 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: bcmath, cli, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
+          extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
           tools: composer:v2
           coverage: none
 
       - name: Install dependencies
-        run: composer install --no-interaction --no-suggest --prefer-dist
+        run: composer install --no-interaction --no-suggest --no-progress --no-scripts
 
       - name: Create SQLite file
         run: touch database/testing.sqlite
 
       - name: Unit tests
-        run: vendor/bin/phpunit tests/Unit
+        run: vendor/bin/pest tests/Unit
         env:
           DB_HOST: UNIT_NO_DB
           SKIP_MIGRATIONS: true
 
       - name: Integration tests
-        run: vendor/bin/phpunit tests/Integration
+        run: vendor/bin/pest tests/Integration
+
+  postgresql:
+    name: PostgreSQL
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [8.2, 8.3, 8.4]
+        database: ["postgres:14"]
+    services:
+      database:
+        image: ${{ matrix.database }}
+        env:
+          POSTGRES_DB: testing
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_HOST_AUTH_METHOD: trust
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+    env:
+      APP_ENV: testing
+      APP_DEBUG: "false"
+      APP_KEY: ThisIsARandomStringForTests12345
+      APP_TIMEZONE: UTC
+      APP_URL: http://localhost/
+      CACHE_DRIVER: array
+      MAIL_MAILER: array
+      SESSION_DRIVER: array
+      QUEUE_CONNECTION: sync
+      DB_CONNECTION: pgsql
+      DB_HOST: 127.0.0.1
+      DB_DATABASE: testing
+      DB_USERNAME: postgres
+      DB_PASSWORD: postgres
+      GUZZLE_TIMEOUT: 60
+      GUZZLE_CONNECT_TIMEOUT: 60
+    steps:
+      - name: Code Checkout
+        uses: actions/checkout@v4
+
+      - name: Get cache directory
+        id: composer-cache
+        run: |
+          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+      - name: Cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
+          tools: composer:v2
+          coverage: none
+
+      - name: Install dependencies
+        run: composer install --no-interaction --no-suggest --no-progress --no-scripts
+
+      - name: Unit tests
+        run: vendor/bin/pest tests/Unit
+        env:
+          DB_HOST: UNIT_NO_DB
+          SKIP_MIGRATIONS: true
+
+      - name: Integration tests
+        run: vendor/bin/pest tests/Integration

.github/workflows/docker-publish.yml

@@ -0,0 +1,165 @@
+name: Docker
+
+on:
+  push:
+    branches:
+      - main
+  release:
+    types:
+      - published
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  build-php-base:
+    name: Build PHP base image on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    permissions:
+      contents: read
+      packages: write
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-24.04
+            arch: amd64
+            platform: linux/amd64
+          - os: ubuntu-24.04-arm
+            arch: arm64
+            platform: linux/arm64
+    steps:
+      - name: Code checkout
+        uses: actions/checkout@v4
+      
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@v3
+      
+      - name: Build the base PHP image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./Dockerfile.base
+          push: false
+          load: true
+          platforms: ${{ matrix.platform }}
+          tags: base-php:${{ matrix.arch }}
+          cache-from: type=gha,scope=base-php${{ matrix.arch }}
+          cache-to: type=gha,scope=base-php${{ matrix.arch }}
+
+      - name: Export image to file
+        run: docker save -o base-php-${{ matrix.arch }}.tar base-php:${{ matrix.arch }}
+      
+      - name: Push the docker build to the artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: base-php-${{ matrix.arch }}.tar
+          path: base-php-${{ matrix.arch }}.tar
+          retention-days: 7
+
+
+  build-and-push:
+    name: Build and Push ubuntu-24.04
+    runs-on: ubuntu-24.04
+    needs: build-php-base
+    permissions:
+      contents: read
+      packages: write
+    strategy:
+      fail-fast: false
+    # Start a temp local registry because workflow can not pull from localy loaded images
+    services:
+      registry:
+        image: registry:2
+        ports:
+          - 5000:5000 
+    # Always run against a tag, even if the commit into the tag has [docker skip] within the commit message.
+    if: "!contains(github.ref, 'main') || (!contains(github.event.head_commit.message, 'skip docker') && !contains(github.event.head_commit.message, 'docker skip'))"
+    steps:
+      - name: Code checkout
+        uses: actions/checkout@v4
+
+      - name: Docker metadata
+        id: docker_meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          flavor: |
+            latest=false
+          tags: |
+            type=raw,value=latest,enable=${{ github.event_name == 'release' && github.event.action == 'published' && github.event.release.prerelease == false }}
+            type=ref,event=tag
+            type=ref,event=branch
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      
+      # We Need to start it in host mode else it can't acces the local registry on port 5000
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          driver-opts: network=host
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get Build Information
+        id: build_info
+        run: |
+          echo "version_tag=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_OUTPUT
+          echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+
+        # Download the base PHP image AMD64
+      - uses: actions/download-artifact@v4
+        with:
+          name: base-php-amd64.tar
+        
+        # Download the base PHP image ARM64
+      - uses: actions/download-artifact@v4
+        with:
+          name: base-php-arm64.tar
+
+      - name: Load base images into local registry
+        run: |
+          docker load -i base-php-amd64.tar
+          docker load -i base-php-arm64.tar
+          docker tag base-php:amd64 localhost:5000/base-php:amd64
+          docker tag base-php:arm64 localhost:5000/base-php:arm64
+          docker push localhost:5000/base-php:amd64
+          docker push localhost:5000/base-php:arm64
+          rm base-php-arm64.tar base-php-amd64.tar
+          
+      - name: Build and Push (tag)
+        uses: docker/build-push-action@v6
+        if: "github.event_name == 'release' && github.event.action == 'published'"
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          platforms: 'linux/amd64,linux/arm64'
+          build-args: |
+            VERSION=${{ steps.build_info.outputs.version_tag }}
+          labels: ${{ steps.docker_meta.outputs.labels }}
+          tags: ${{ steps.docker_meta.outputs.tags }}
+          cache-from: type=gha,scope=tagged${{ matrix.os }}
+          cache-to: type=gha,scope=tagged${{ matrix.os }},mode=max
+        
+      - name: Build and Push (main)
+        uses: docker/build-push-action@v6
+        if: "github.event_name == 'push' && contains(github.ref, 'main')"
+        with:
+          context: .
+          file: ./Dockerfile
+          push: ${{ github.event_name != 'pull_request' }}
+          platforms: 'linux/amd64,linux/arm64'
+          build-args: |
+            VERSION=dev-${{ steps.build_info.outputs.short_sha }}
+          labels: ${{ steps.docker_meta.outputs.labels }}
+          tags: ${{ steps.docker_meta.outputs.tags }}
+          cache-from: type=gha,scope=${{ matrix.os }}
+          cache-to: type=gha,scope=${{ matrix.os }},mode=max

.github/workflows/lint.yaml

@@ -6,8 +6,8 @@ on:
       - '**'
 
 jobs:
-  lint:
-    name: Lint
+  pint:
+    name: Pint
     runs-on: ubuntu-latest
     steps:
       - name: Code Checkout
@@ -16,7 +16,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.2"
+          php-version: "8.3"
           extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
           tools: composer:v2
           coverage: none
@@ -25,7 +25,47 @@ jobs:
         run: cp .env.example .env
 
       - name: Install dependencies
-        run: composer install --no-interaction --no-progress --prefer-dist
+        run: composer install --no-interaction --no-suggest --no-progress --no-autoloader --no-scripts
 
       - name: Pint
         run: vendor/bin/pint --test
+  phpstan:
+    name: PHPStan
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [ 8.2, 8.3, 8.4 ]
+    steps:
+      - name: Code Checkout
+        uses: actions/checkout@v4
+
+      - name: Get cache directory
+        id: composer-cache
+        run: |
+          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+      - name: Cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-${{ matrix.php }}-
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
+          tools: composer:v2
+          coverage: none
+
+      - name: Setup .env
+        run: cp .env.example .env
+
+      - name: Install dependencies
+        run: composer install --no-interaction --no-suggest --no-progress --no-scripts
+
+      - name: PHPStan
+        run: vendor/bin/phpstan --memory-limit=-1 --error-format=github

.github/workflows/release.yaml

@@ -11,22 +11,33 @@ jobs:
     runs-on: ubuntu-22.04
     permissions:
       contents: write
-      
+
     steps:
       - name: Code checkout
         uses: actions/checkout@v4
 
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
+          tools: composer:v2
+          coverage: none
+
+      - name: Install PHP dependencies
+        run: composer install --no-interaction --no-suggest --no-progress --no-autoloader --no-scripts --no-dev
+
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: "yarn"
 
-      - name: Install dependencies
+      - name: Install JS dependencies
         run: yarn install --frozen-lockfile
 
       - name: Build
-        run: yarn build:production
+        run: yarn build
 
       - name: Create release branch and bump version
         env:
@@ -44,8 +55,8 @@ jobs:
 
       - name: Create release archive
         run: |
-          rm -rf node_modules tests CODE_OF_CONDUCT.md CONTRIBUTING.md flake.lock flake.nix phpunit.xml shell.nix
-          tar -czf panel.tar.gz * .editorconfig .env.example .eslintignore .eslintrc.js .gitignore .prettierrc.json
+          rm -rf node_modules vendor tests CODE_OF_CONDUCT.md CONTRIBUTING.md phpunit.xml shell.nix
+          tar -czf panel.tar.gz * .env.example
 
       - name: Create checksum
         run: |
@@ -54,31 +65,12 @@ jobs:
 
       - name: Create release
         id: create_release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           draft: true
           prerelease: ${{ contains(github.ref, 'rc') || contains(github.ref, 'beta') || contains(github.ref, 'alpha') }}
-
-      - name: Upload release archive
-        id: upload-release-archive
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: panel.tar.gz
-          asset_name: panel.tar.gz
-          asset_content_type: application/gzip
-
-      - name: Upload release checksum
-        id: upload-release-checksum
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./checksum.txt
-          asset_name: checksum.txt
-          asset_content_type: text/plain
+          files: |
+            panel.tar.gz
+            checksum.txt

.gitignore

@@ -1,9 +1,9 @@
 /.phpunit.cache
 /node_modules
 /public/build
-/public/hot
 /public/storage
 /storage/*.key
+/storage/pail
 /storage/clockwork/*
 /vendor
 *.DS_Store*
@@ -19,10 +19,11 @@ npm-debug.log
 yarn-error.log
 /.fleet
 /.idea
+/.nova
 /.vscode
 
 public/assets/manifest.json
-/database/*.sqlite
+/database/*.sqlite*
 filament-monaco-editor/
 _ide_helper*
 /.phpstorm.meta.php

.php-cs-fixer.dist.php

@@ -1,52 +0,0 @@
-<?php
-
-use PhpCsFixer\Config;
-use PhpCsFixer\Finder;
-
-$finder = (new Finder())
-    ->in(__DIR__)
-    ->exclude([
-        'vendor',
-        'node_modules',
-        'storage',
-        'bootstrap/cache',
-    ])
-    ->notName(['_ide_helper*']);
-
-return (new Config())
-    ->setRiskyAllowed(true)
-    ->setFinder($finder)
-    ->setRules([
-        '@Symfony' => true,
-        '@PSR1' => true,
-        '@PSR2' => true,
-        '@PSR12' => true,
-        'align_multiline_comment' => ['comment_type' => 'phpdocs_like'],
-        'combine_consecutive_unsets' => true,
-        'concat_space' => ['spacing' => 'one'],
-        'heredoc_to_nowdoc' => true,
-        'no_alias_functions' => true,
-        'no_unreachable_default_argument_value' => true,
-        'no_useless_return' => true,
-        'ordered_imports' => [
-            'sort_algorithm' => 'length',
-        ],
-        'phpdoc_align' => [
-            'align' => 'left',
-            'tags' => [
-                'param',
-                'property',
-                'return',
-                'throws',
-                'type',
-                'var',
-            ],
-        ],
-        'random_api_migration' => true,
-        'ternary_to_null_coalescing' => true,
-        'yoda_style' => [
-            'equal' => false,
-            'identical' => false,
-            'less_and_greater' => false,
-        ],
-    ]);

Dockerfile

@@ -1,41 +1,108 @@
-# Stage 0:
-# Build the assets that are needed for the frontend. This build stage is then discarded
-# since we won't need NodeJS anymore in the future. This Docker image ships a final production
-# level distribution
-FROM --platform=$TARGETOS/$TARGETARCH node:20-alpine
-WORKDIR /app
-COPY . ./
-RUN yarn install --frozen-lockfile \
-    && yarn run build:production
+# syntax=docker.io/docker/dockerfile:1.13-labs
+# Pelican Production Dockerfile
 
-# Stage 1:
-# Build the actual container with all of the needed PHP dependencies that will run the application.
-FROM --platform=$TARGETOS/$TARGETARCH php:8.3-fpm-alpine
-WORKDIR /app
-COPY . ./
-COPY --from=0 /app/public/assets ./public/assets
-RUN apk add --no-cache --update ca-certificates dcron curl git supervisor tar unzip nginx libpng-dev libxml2-dev libzip-dev icu-dev certbot certbot-nginx \
-    && docker-php-ext-configure zip \
-    && docker-php-ext-install bcmath gd intl pdo_mysql zip \
-    && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
-    && cp .env.example .env \
-    && mkdir -p bootstrap/cache/ storage/logs storage/framework/sessions storage/framework/views storage/framework/cache \
-    && chmod 777 -R bootstrap storage \
-    && composer install --no-dev --optimize-autoloader \
-    && rm -rf .env bootstrap/cache/*.php \
-    && mkdir -p /app/storage/logs/ \
-    && chown -R nginx:nginx .
+##
+#  If you want to build this locally you want to run `docker build -f Dockerfile.dev`
+##
 
-RUN rm /usr/local/etc/php-fpm.conf \
-    && echo "* * * * * /usr/local/bin/php /app/artisan schedule:run >> /dev/null 2>&1" >> /var/spool/cron/crontabs/root \
-    && echo "0 23 * * * certbot renew --nginx --quiet" >> /var/spool/cron/crontabs/root \
-    && sed -i s/ssl_session_cache/#ssl_session_cache/g /etc/nginx/nginx.conf \
-    && mkdir -p /var/run/php /var/run/nginx
+# ================================
+# Stage 1-1: Composer Install
+# ================================
+FROM --platform=$TARGETOS/$TARGETARCH localhost:5000/base-php:$TARGETARCH AS composer
 
-COPY .github/docker/default.conf /etc/nginx/http.d/default.conf
-COPY .github/docker/www.conf /usr/local/etc/php-fpm.conf
-COPY .github/docker/supervisord.conf /etc/supervisord.conf
+WORKDIR /build
+
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
+
+# Copy bare minimum to install Composer dependencies
+COPY composer.json composer.lock ./
+
+RUN composer install --no-dev --no-interaction --no-autoloader --no-scripts
+
+# ================================
+# Stage 1-2: Yarn Install
+# ================================
+FROM --platform=$TARGETOS/$TARGETARCH node:20-alpine AS yarn
+
+WORKDIR /build
+
+# Copy bare minimum to install Yarn dependencies
+COPY package.json yarn.lock ./
+
+RUN yarn config set network-timeout 300000 \
+    && yarn install --frozen-lockfile
+
+# ================================
+# Stage 2-1: Composer Optimize
+# ================================
+FROM --platform=$TARGETOS/$TARGETARCH composer AS composerbuild
+
+# Copy full code to optimize autoload
+COPY --exclude=Caddyfile --exclude=docker/ . ./
+
+RUN composer dump-autoload --optimize
+
+# ================================
+# Stage 2-2: Build Frontend Assets
+# ================================
+FROM --platform=$TARGETOS/$TARGETARCH yarn AS yarnbuild
+
+WORKDIR /build
+
+# Copy full code
+COPY --exclude=Caddyfile --exclude=docker/ . ./
+COPY --from=composer /build .
+
+RUN yarn run build
+
+# ================================
+# Stage 5: Build Final Application Image
+# ================================
+FROM --platform=$TARGETOS/$TARGETARCH localhost:5000/base-php:$TARGETARCH AS final
+
+WORKDIR /var/www/html
+
+# Install additional required libraries
+RUN apk update && apk add --no-cache \
+    caddy ca-certificates supervisor supercronic
+
+COPY --chown=root:www-data --chmod=640 --from=composerbuild /build .
+COPY --chown=root:www-data --chmod=640 --from=yarnbuild /build/public ./public
+
+# Set permissions
+# First ensure all files are owned by root and restrict www-data to read access
+RUN chown root:www-data ./ \
+    && chmod 750 ./ \
+    # Files should not have execute set, but directories need it
+    && find ./ -type d -exec chmod 750 {} \; \
+    # Create necessary directories
+    && mkdir -p /pelican-data/storage /var/www/html/storage/app/public /var/run/supervisord /etc/supercronic \
+    # Symlinks for env, database, and avatars
+    && ln -s /pelican-data/.env ./.env \
+    && ln -s /pelican-data/database/database.sqlite ./database/database.sqlite \
+    && ln -sf /var/www/html/storage/app/public /var/www/html/public/storage \
+    && ln -s  /pelican-data/storage/avatars /var/www/html/storage/app/public/avatars \
+    && ln -s  /pelican-data/storage/fonts /var/www/html/storage/app/public/fonts \
+    # Allow www-data write permissions where necessary
+    && chown -R www-data:www-data /pelican-data ./storage ./bootstrap/cache /var/run/supervisord /var/www/html/public/storage \
+    && chmod -R u+rwX,g+rwX,o-rwx /pelican-data ./storage ./bootstrap/cache /var/run/supervisord
+
+# Configure Supervisor
+COPY docker/supervisord.conf /etc/supervisord.conf
+COPY docker/Caddyfile /etc/caddy/Caddyfile
+# Add Laravel scheduler to crontab
+COPY docker/crontab /etc/supercronic/crontab
+
+COPY docker/entrypoint.sh ./docker/entrypoint.sh
+
+HEALTHCHECK --interval=5m --timeout=10s --start-period=5s --retries=3 \
+  CMD curl -f http://localhost/up || exit 1
 
 EXPOSE 80 443
-ENTRYPOINT [ "/bin/ash", ".github/docker/entrypoint.sh" ]
+
+VOLUME /pelican-data
+
+USER www-data
+
+ENTRYPOINT [ "/bin/ash", "docker/entrypoint.sh" ]
 CMD [ "supervisord", "-n", "-c", "/etc/supervisord.conf" ]

Dockerfile.base

@@ -0,0 +1,10 @@
+# ================================
+# Stage 0: Build PHP Base Image
+# ================================
+FROM --platform=$TARGETOS/$TARGETARCH php:8.4-fpm-alpine
+
+ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
+
+RUN install-php-extensions bcmath gd intl zip opcache pcntl posix pdo_mysql pdo_pgsql
+
+RUN rm /usr/local/bin/install-php-extensions

Dockerfile.dev

@@ -0,0 +1,112 @@
+# syntax=docker.io/docker/dockerfile:1.13-labs
+# Pelican Development Dockerfile
+
+FROM --platform=$TARGETOS/$TARGETARCH php:8.4-fpm-alpine AS base
+
+ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
+
+RUN install-php-extensions bcmath gd intl zip opcache pcntl posix pdo_mysql pdo_pgsql
+
+RUN rm /usr/local/bin/install-php-extensions
+
+# ================================
+# Stage 1-1: Composer Install
+# ================================
+FROM --platform=$TARGETOS/$TARGETARCH base AS composer
+
+WORKDIR /build
+
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
+
+# Copy bare minimum to install Composer dependencies
+COPY composer.json composer.lock ./
+
+RUN composer install --no-dev --no-interaction --no-autoloader --no-scripts
+
+# ================================
+# Stage 1-2: Yarn Install
+# ================================
+FROM --platform=$TARGETOS/$TARGETARCH node:20-alpine AS yarn
+
+WORKDIR /build
+
+# Copy bare minimum to install Yarn dependencies
+COPY package.json yarn.lock ./
+
+RUN yarn config set network-timeout 300000 \
+    && yarn install --frozen-lockfile
+
+# ================================
+# Stage 2-1: Composer Optimize
+# ================================
+FROM --platform=$TARGETOS/$TARGETARCH composer AS composerbuild
+
+# Copy full code to optimize autoload
+COPY --exclude=Caddyfile --exclude=docker/ . ./
+
+RUN composer dump-autoload --optimize
+
+# ================================
+# Stage 2-2: Build Frontend Assets
+# ================================
+FROM --platform=$TARGETOS/$TARGETARCH yarn AS yarnbuild
+
+WORKDIR /build
+
+# Copy full code
+COPY --exclude=Caddyfile --exclude=docker/ . ./
+COPY --from=composer /build .
+
+RUN yarn run build
+
+# ================================
+# Stage 5: Build Final Application Image
+# ================================
+FROM --platform=$TARGETOS/$TARGETARCH base AS final
+
+WORKDIR /var/www/html
+
+# Install additional required libraries
+RUN apk update && apk add --no-cache \
+    caddy ca-certificates supervisor supercronic
+
+COPY --chown=root:www-data --chmod=640 --from=composerbuild /build .
+COPY --chown=root:www-data --chmod=640 --from=yarnbuild /build/public ./public
+
+# Set permissions
+# First ensure all files are owned by root and restrict www-data to read access
+RUN chown root:www-data ./ \
+    && chmod 750 ./ \
+    # Files should not have execute set, but directories need it
+    && find ./ -type d -exec chmod 750 {} \; \
+    # Create necessary directories
+    && mkdir -p /pelican-data/storage /var/www/html/storage/app/public /var/run/supervisord /etc/supercronic \
+    # Symlinks for env, database, and avatars
+    && ln -s /pelican-data/.env ./.env \
+    && ln -s /pelican-data/database/database.sqlite ./database/database.sqlite \
+    && ln -sf /var/www/html/storage/app/public /var/www/html/public/storage \
+    && ln -s  /pelican-data/storage/avatars /var/www/html/storage/app/public/avatars \
+    && ln -s  /pelican-data/storage/fonts /var/www/html/storage/app/public/fonts \
+    # Allow www-data write permissions where necessary
+    && chown -R www-data:www-data /pelican-data ./storage ./bootstrap/cache /var/run/supervisord /var/www/html/public/storage \
+    && chmod -R u+rwX,g+rwX,o-rwx /pelican-data ./storage ./bootstrap/cache /var/run/supervisord
+
+# Configure Supervisor
+COPY docker/supervisord.conf /etc/supervisord.conf
+COPY docker/Caddyfile /etc/caddy/Caddyfile
+# Add Laravel scheduler to crontab
+COPY docker/crontab /etc/supercronic/crontab
+
+COPY docker/entrypoint.sh ./docker/entrypoint.sh
+
+HEALTHCHECK --interval=5m --timeout=10s --start-period=5s --retries=3 \
+  CMD curl -f http://localhost/up || exit 1
+
+EXPOSE 80 443
+
+VOLUME /pelican-data
+
+USER www-data
+
+ENTRYPOINT [ "/bin/ash", "docker/entrypoint.sh" ]
+CMD [ "supervisord", "-n", "-c", "/etc/supervisord.conf" ]

app/Checks/CacheCheck.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Checks;
+
+use Exception;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Str;
+use Spatie\Health\Checks\Check;
+use Spatie\Health\Checks\Result;
+
+class CacheCheck extends Check
+{
+    protected ?string $driver = null;
+
+    public function driver(string $driver): self
+    {
+        $this->driver = $driver;
+
+        return $this;
+    }
+
+    public function run(): Result
+    {
+        $driver = $this->driver ?? $this->defaultDriver();
+
+        $result = Result::make()->meta([
+            'driver' => $driver,
+        ]);
+
+        try {
+            return $this->canWriteValuesToCache($driver)
+                ? $result->ok(trans('admin/health.results.cache.ok'))
+                : $result->failed(trans('admin/health.results.cache.failed_retrieve'));
+        } catch (Exception $exception) {
+            return $result->failed(trans('admin/health.results.cache.failed', ['error' => $exception->getMessage()]));
+        }
+    }
+
+    protected function defaultDriver(): ?string
+    {
+        return config('cache.default', 'file');
+    }
+
+    protected function canWriteValuesToCache(?string $driver): bool
+    {
+        $expectedValue = Str::random(5);
+
+        $cacheName = "laravel-health:check-{$expectedValue}";
+
+        Cache::driver($driver)->put($cacheName, $expectedValue, 10);
+
+        $actualValue = Cache::driver($driver)->get($cacheName);
+
+        Cache::driver($driver)->forget($cacheName);
+
+        return $actualValue === $expectedValue;
+    }
+}

app/Checks/DatabaseCheck.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Checks;
+
+use Exception;
+use Illuminate\Support\Facades\DB;
+use Spatie\Health\Checks\Check;
+use Spatie\Health\Checks\Result;
+
+class DatabaseCheck extends Check
+{
+    protected ?string $connectionName = null;
+
+    public function connectionName(string $connectionName): self
+    {
+        $this->connectionName = $connectionName;
+
+        return $this;
+    }
+
+    public function run(): Result
+    {
+        $connectionName = $this->connectionName ?? $this->getDefaultConnectionName();
+
+        $result = Result::make()->meta([
+            'connection_name' => $connectionName,
+        ]);
+
+        try {
+            DB::connection($connectionName)->getPdo();
+
+            return $result->ok(trans('admin/health.results.database.ok'));
+        } catch (Exception $exception) {
+            return $result->failed(trans('admin/health.results.database.failed', ['error' => $exception->getMessage()]));
+        }
+    }
+
+    protected function getDefaultConnectionName(): string
+    {
+        return config('database.default');
+    }
+}

app/Checks/DebugModeCheck.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Checks;
+
+use Spatie\Health\Checks\Check;
+use Spatie\Health\Checks\Result;
+
+use function config;
+
+class DebugModeCheck extends Check
+{
+    protected bool $expected = false;
+
+    public function expectedToBe(bool $bool): self
+    {
+        $this->expected = $bool;
+
+        return $this;
+    }
+
+    public function run(): Result
+    {
+        $actual = config('app.debug');
+
+        $result = Result::make()
+            ->meta([
+                'actual' => $actual,
+                'expected' => $this->expected,
+            ])
+            ->shortSummary($this->convertToWord($actual));
+
+        return $this->expected === $actual
+            ? $result->ok()
+            : $result->failed(trans('admin/health.results.debugmode.failed', [
+                'actual' => $this->convertToWord($actual),
+                'expected' => $this->convertToWord($this->expected),
+            ]));
+    }
+
+    protected function convertToWord(bool $boolean): string
+    {
+        return $boolean ? 'true' : 'false';
+    }
+}

app/Checks/EnvironmentCheck.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Checks;
+
+use Illuminate\Support\Facades\App;
+use Spatie\Health\Checks\Check;
+use Spatie\Health\Checks\Result;
+
+class EnvironmentCheck extends Check
+{
+    protected string $expectedEnvironment = 'production';
+
+    public function expectEnvironment(string $expectedEnvironment): self
+    {
+        $this->expectedEnvironment = $expectedEnvironment;
+
+        return $this;
+    }
+
+    public function run(): Result
+    {
+        $actualEnvironment = (string) App::environment();
+
+        $result = Result::make()
+            ->meta([
+                'actual' => $actualEnvironment,
+                'expected' => $this->expectedEnvironment,
+            ])
+            ->shortSummary($actualEnvironment);
+
+        return $this->expectedEnvironment === $actualEnvironment
+            ? $result->ok(trans('admin/health.results.environment.ok'))
+            : $result->failed(trans('admin/health.results.environment.failed', [
+                'actual' => $actualEnvironment,
+                'expected' => $this->expectedEnvironment,
+            ]));
+    }
+}

app/Checks/NodeVersionsCheck.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Checks;
+
+use App\Models\Node;
+use App\Services\Helpers\SoftwareVersionService;
+use Spatie\Health\Checks\Check;
+use Spatie\Health\Checks\Result;
+use Spatie\Health\Enums\Status;
+
+class NodeVersionsCheck extends Check
+{
+    public function __construct(private SoftwareVersionService $versionService) {}
+
+    public function run(): Result
+    {
+        $all = Node::all();
+
+        if ($all->isEmpty()) {
+            $result = Result::make()
+                ->notificationMessage(trans('admin/health.results.nodeversions.no_nodes_created'))
+                ->shortSummary(trans('admin/health.results.nodeversions.no_nodes'));
+            $result->status = Status::skipped();
+
+            return $result;
+        }
+
+        $outdated = $all
+            ->filter(fn (Node $node) => !isset($node->systemInformation()['exception']) && !$this->versionService->isLatestWings($node->systemInformation()['version']))
+            ->count();
+
+        $all = $all->count();
+        $latestVersion = $this->versionService->latestWingsVersion();
+
+        $result = Result::make()
+            ->meta([
+                'all' => $all,
+                'outdated' => $outdated,
+                'latestVersion' => $latestVersion,
+            ])
+            ->shortSummary($outdated === 0 ? trans('admin/health.results.nodeversions.all_up_to_date') : trans('admin/health.results.nodeversions.outdated', ['outdated' => $outdated, 'all' => $all]));
+
+        return $outdated === 0
+            ? $result->ok(trans('admin/health.results.nodeversions.ok'))
+            : $result->failed(trans('admin/health.results.nodeversions.failed', ['outdated' => $outdated, 'all' => $all]));
+    }
+}

app/Checks/PanelVersionCheck.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Checks;
+
+use App\Services\Helpers\SoftwareVersionService;
+use Spatie\Health\Checks\Check;
+use Spatie\Health\Checks\Result;
+
+class PanelVersionCheck extends Check
+{
+    public function __construct(private SoftwareVersionService $versionService) {}
+
+    public function run(): Result
+    {
+        $isLatest = $this->versionService->isLatestPanel();
+        $currentVersion = $this->versionService->currentPanelVersion();
+        $latestVersion = $this->versionService->latestPanelVersion();
+
+        $result = Result::make()
+            ->meta([
+                'isLatest' => $isLatest,
+                'currentVersion' => $currentVersion,
+                'latestVersion' => $latestVersion,
+            ])
+            ->shortSummary($isLatest ? trans('admin/health.results.panelversion.up_to_date') : trans('admin/health.results.panelversion.outdated'));
+
+        return $isLatest
+            ? $result->ok(trans('admin/health.results.panelversion.ok'))
+            : $result->failed(trans('admin/health.results.panelversion.failed', [
+                'currentVersion' => $currentVersion,
+                'latestVersion' => $latestVersion,
+            ]));
+    }
+}

app/Checks/ScheduleCheck.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Checks;
+
+use Carbon\Carbon;
+use Composer\InstalledVersions;
+use Spatie\Health\Checks\Checks\ScheduleCheck as BaseCheck;
+use Spatie\Health\Checks\Result;
+
+class ScheduleCheck extends BaseCheck
+{
+    public function run(): Result
+    {
+        $result = Result::make()->ok(trans('admin/health.results.schedule.ok'));
+
+        $lastHeartbeatTimestamp = cache()->store($this->cacheStoreName)->get($this->cacheKey);
+
+        if (!$lastHeartbeatTimestamp) {
+            return $result->failed(trans('admin/health.results.schedule.failed_not_ran'));
+        }
+
+        $latestHeartbeatAt = Carbon::createFromTimestamp($lastHeartbeatTimestamp);
+
+        $carbonVersion = InstalledVersions::getVersion('nesbot/carbon');
+
+        $minutesAgo = $latestHeartbeatAt->diffInMinutes();
+
+        if (version_compare($carbonVersion,
+            '3.0.0', '<')) {
+            $minutesAgo += 1;
+        }
+
+        if ($minutesAgo > $this->heartbeatMaxAgeInMinutes) {
+            return $result->failed(trans('admin/health.results.schedule.failed_last_ran', [
+                'time' => $minutesAgo,
+            ]));
+        }
+
+        return $result;
+    }
+}

app/Checks/UsedDiskSpaceCheck.php

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

app/Console/Commands/Egg/CheckEggUpdatesCommand.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Console\Commands\Egg;
+
+use App\Models\Egg;
+use App\Services\Eggs\Sharing\EggExporterService;
+use Exception;
+use Illuminate\Console\Command;
+
+class CheckEggUpdatesCommand extends Command
+{
+    protected $signature = 'p:egg:check-updates';
+
+    public function handle(EggExporterService $exporterService): void
+    {
+        $eggs = Egg::all();
+        foreach ($eggs as $egg) {
+            try {
+                $this->check($egg, $exporterService);
+            } catch (Exception $exception) {
+                $this->error("{$egg->name}: Error ({$exception->getMessage()})");
+            }
+        }
+    }
+
+    private function check(Egg $egg, EggExporterService $exporterService): void
+    {
+        if (is_null($egg->update_url)) {
+            $this->comment("$egg->name: Skipping (no update url set)");
+
+            return;
+        }
+
+        $currentJson = json_decode($exporterService->handle($egg->id));
+        unset($currentJson->exported_at);
+
+        $updatedEgg = file_get_contents($egg->update_url);
+        assert($updatedEgg !== false);
+        $updatedJson = json_decode($updatedEgg);
+        unset($updatedJson->exported_at);
+
+        if (md5(json_encode($currentJson, JSON_THROW_ON_ERROR)) === md5(json_encode($updatedJson, JSON_THROW_ON_ERROR))) {
+            $this->info("$egg->name: Up-to-date");
+            cache()->put("eggs.$egg->uuid.update", false, now()->addHour());
+
+            return;
+        }
+
+        $this->warn("$egg->name: Found update");
+        cache()->put("eggs.$egg->uuid.update", true, now()->addHour());
+    }
+}

app/Console/Commands/Environment/AppSettingsCommand.php

@@ -3,160 +3,30 @@
 namespace App\Console\Commands\Environment;
 
 use Illuminate\Console\Command;
-use Illuminate\Contracts\Console\Kernel;
-use App\Traits\Commands\EnvironmentWriterTrait;
-use Illuminate\Support\Facades\Artisan;
 
 class AppSettingsCommand extends Command
 {
-    use EnvironmentWriterTrait;
-
-    public const CACHE_DRIVERS = [
-        'file' => 'Filesystem (recommended)',
-        'redis' => 'Redis',
-    ];
-
-    public const SESSION_DRIVERS = [
-        'file' => 'Filesystem (recommended)',
-        'redis' => 'Redis',
-        'database' => 'Database',
-        'cookie' => 'Cookie',
-    ];
-
-    public const QUEUE_DRIVERS = [
-        'database' => 'Database (recommended)',
-        'redis' => 'Redis',
-        'sync' => 'Synchronous',
-    ];
-
     protected $description = 'Configure basic environment settings for the Panel.';
 
-    protected $signature = 'p:environment:setup
-                            {--url= : The URL that this Panel is running on.}
-                            {--cache= : The cache driver backend to use.}
-                            {--session= : The session driver backend to use.}
-                            {--queue= : The queue driver backend to use.}
-                            {--redis-host= : Redis host to use for connections.}
-                            {--redis-pass= : Password used to connect to redis.}
-                            {--redis-port= : Port to connect to redis over.}
-                            {--settings-ui= : Enable or disable the settings UI.}';
+    protected $signature = 'p:environment:setup';
 
-    protected array $variables = [];
-
-    /**
-     * AppSettingsCommand constructor.
-     */
-    public function __construct(private Kernel $console)
+    public function handle(): void
     {
-        parent::__construct();
-    }
-
-    /**
-     * Handle command execution.
-     *
-     * @throws \App\Exceptions\PanelException
-     */
-    public function handle(): int
-    {
-        $this->variables['APP_TIMEZONE'] = 'UTC';
-
-        $this->output->comment(__('commands.appsettings.comment.url'));
-        $this->variables['APP_URL'] = $this->option('url') ?? $this->ask(
-            'Application URL',
-            config('app.url', 'https://example.com')
-        );
-
-        $selected = config('cache.default', 'file');
-        $this->variables['CACHE_STORE'] = $this->option('cache') ?? $this->choice(
-            'Cache Driver',
-            self::CACHE_DRIVERS,
-            array_key_exists($selected, self::CACHE_DRIVERS) ? $selected : null
-        );
-
-        $selected = config('session.driver', 'file');
-        $this->variables['SESSION_DRIVER'] = $this->option('session') ?? $this->choice(
-            'Session Driver',
-            self::SESSION_DRIVERS,
-            array_key_exists($selected, self::SESSION_DRIVERS) ? $selected : null
-        );
-
-        $selected = config('queue.default', 'database');
-        $this->variables['QUEUE_CONNECTION'] = $this->option('queue') ?? $this->choice(
-            'Queue Driver',
-            self::QUEUE_DRIVERS,
-            array_key_exists($selected, self::QUEUE_DRIVERS) ? $selected : null
-        );
-
-        if (!is_null($this->option('settings-ui'))) {
-            $this->variables['APP_ENVIRONMENT_ONLY'] = $this->option('settings-ui') == 'true' ? 'false' : 'true';
-        } else {
-            $this->variables['APP_ENVIRONMENT_ONLY'] = $this->confirm(__('commands.appsettings.comment.settings_ui'), true) ? 'false' : 'true';
-        }
-
-        // Make sure session cookies are set as "secure" when using HTTPS
-        if (str_starts_with($this->variables['APP_URL'], 'https://')) {
-            $this->variables['SESSION_SECURE_COOKIE'] = 'true';
-        }
-
-        $redisUsed = count(collect($this->variables)->filter(function ($item) {
-            return $item === 'redis';
-        })) !== 0;
-
-        if ($redisUsed) {
-            $this->requestRedisSettings();
-        }
-
         $path = base_path('.env');
         if (!file_exists($path)) {
+            $this->comment('Copying example .env file');
             copy($path . '.example', $path);
         }
 
-        $this->writeToEnvironment($this->variables);
-
         if (!config('app.key')) {
-            Artisan::call('key:generate');
+            $this->comment('Generating app key');
+            $this->call('key:generate');
         }
 
-        if ($this->variables['QUEUE_CONNECTION'] !== 'sync') {
-            Artisan::call('p:environment:queue-service', $redisUsed ? ['--use-redis'] : []);
-        }
+        $this->comment('Creating storage link');
+        $this->call('storage:link');
 
-        $this->info($this->console->output());
-
-        return 0;
-    }
-
-    /**
-     * Request connection details and verify them.
-     */
-    private function requestRedisSettings(): void
-    {
-        $this->output->note(__('commands.appsettings.redis.note'));
-        $this->variables['REDIS_HOST'] = $this->option('redis-host') ?? $this->ask(
-            'Redis Host',
-            config('database.redis.default.host')
-        );
-
-        $askForRedisPassword = true;
-        if (!empty(config('database.redis.default.password'))) {
-            $this->variables['REDIS_PASSWORD'] = config('database.redis.default.password');
-            $askForRedisPassword = $this->confirm('It seems a password is already defined for Redis, would you like to change it?');
-        }
-
-        if ($askForRedisPassword) {
-            $this->output->comment(__('commands.appsettings.redis.comment'));
-            $this->variables['REDIS_PASSWORD'] = $this->option('redis-pass') ?? $this->output->askHidden(
-                'Redis Password'
-            );
-        }
-
-        if (empty($this->variables['REDIS_PASSWORD'])) {
-            $this->variables['REDIS_PASSWORD'] = 'null';
-        }
-
-        $this->variables['REDIS_PORT'] = $this->option('redis-port') ?? $this->ask(
-            'Redis Port',
-            config('database.redis.default.port')
-        );
+        $this->comment('Caching components & icons');
+        $this->call('filament:optimize');
     }
 }

app/Console/Commands/Environment/CacheSettingsCommand.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Console\Commands\Environment;
+
+use App\Traits\Commands\RequestRedisSettingsTrait;
+use App\Traits\EnvironmentWriterTrait;
+use Illuminate\Console\Command;
+use Illuminate\Contracts\Console\Kernel;
+
+class CacheSettingsCommand extends Command
+{
+    use EnvironmentWriterTrait;
+    use RequestRedisSettingsTrait;
+
+    public const CACHE_DRIVERS = [
+        'file' => 'Filesystem (default)',
+        'database' => 'Database',
+        'redis' => 'Redis',
+    ];
+
+    protected $description = 'Configure cache settings for the Panel.';
+
+    protected $signature = 'p:environment:cache
+                            {--driver= : The cache driver backend to use.}
+                            {--redis-host= : Redis host to use for connections.}
+                            {--redis-user= : User used to connect to redis.}
+                            {--redis-pass= : Password used to connect to redis.}
+                            {--redis-port= : Port to connect to redis over.}';
+
+    /**
+     * CacheSettingsCommand constructor.
+     */
+    public function __construct(private Kernel $console)
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Handle command execution.
+     */
+    public function handle(): int
+    {
+        $selected = config('cache.default', 'file');
+        $this->variables['CACHE_STORE'] = $this->option('driver') ?? $this->choice(
+            'Cache Driver',
+            self::CACHE_DRIVERS,
+            array_key_exists($selected, self::CACHE_DRIVERS) ? $selected : null
+        );
+
+        if ($this->variables['CACHE_STORE'] === 'redis') {
+            $this->requestRedisSettings();
+
+            if (config('queue.default') !== 'sync') {
+                $this->call('p:environment:queue-service', [
+                    '--overwrite' => true,
+                ]);
+            }
+        }
+
+        $this->writeToEnvironment($this->variables);
+
+        $this->info($this->console->output());
+
+        return 0;
+    }
+}

app/Console/Commands/Environment/DatabaseSettingsCommand.php

@@ -2,10 +2,10 @@
 
 namespace App\Console\Commands\Environment;
 
+use App\Traits\EnvironmentWriterTrait;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Console\Kernel;
 use Illuminate\Database\DatabaseManager;
-use App\Traits\Commands\EnvironmentWriterTrait;
 
 class DatabaseSettingsCommand extends Command
 {
@@ -13,6 +13,7 @@ class DatabaseSettingsCommand extends Command
 
     public const DATABASE_DRIVERS = [
         'sqlite' => 'SQLite (recommended)',
+        'mariadb' => 'MariaDB',
         'mysql' => 'MySQL',
     ];
 
@@ -21,11 +22,12 @@ class DatabaseSettingsCommand extends Command
     protected $signature = 'p:environment:database
                             {--driver= : The database driver backend to use.}
                             {--database= : The database to use.}
-                            {--host= : The connection address for the MySQL server.}
-                            {--port= : The connection port for the MySQL server.}
-                            {--username= : Username to use when connecting to the MySQL server.}
-                            {--password= : Password to use for the MySQL database.}';
+                            {--host= : The connection address for the MySQL/ MariaDB server.}
+                            {--port= : The connection port for the MySQL/ MariaDB server.}
+                            {--username= : Username to use when connecting to the MySQL/ MariaDB server.}
+                            {--password= : Password to use for the MySQL/ MariaDB database.}';
 
+    /** @var array<array-key, mixed> */
     protected array $variables = [];
 
     /**
@@ -41,6 +43,13 @@ class DatabaseSettingsCommand extends Command
      */
     public function handle(): int
     {
+        $this->error('Changing the database driver will NOT move any database data!');
+        $this->error('Please make sure you made a database backup first!');
+        $this->error('After changing the driver you will have to manually move the old data to the new database.');
+        if (!$this->confirm('Do you want to continue?')) {
+            return 1;
+        }
+
         $selected = config('database.default', 'sqlite');
         $this->variables['DB_CONNECTION'] = $this->option('driver') ?? $this->choice(
             'Database Driver',
@@ -49,7 +58,7 @@ class DatabaseSettingsCommand extends Command
         );
 
         if ($this->variables['DB_CONNECTION'] === 'mysql') {
-            $this->output->note(__('commands.database_settings.DB_HOST_note'));
+            $this->output->note(trans('commands.database_settings.DB_HOST_note'));
             $this->variables['DB_HOST'] = $this->option('host') ?? $this->ask(
                 'Database Host',
                 config('database.connections.mysql.host', '127.0.0.1')
@@ -65,7 +74,7 @@ class DatabaseSettingsCommand extends Command
                 config('database.connections.mysql.database', 'panel')
             );
 
-            $this->output->note(__('commands.database_settings.DB_USERNAME_note'));
+            $this->output->note(trans('commands.database_settings.DB_USERNAME_note'));
             $this->variables['DB_USERNAME'] = $this->option('username') ?? $this->ask(
                 'Database Username',
                 config('database.connections.mysql.username', 'pelican')
@@ -74,7 +83,7 @@ class DatabaseSettingsCommand extends Command
             $askForMySQLPassword = true;
             if (!empty(config('database.connections.mysql.password')) && $this->input->isInteractive()) {
                 $this->variables['DB_PASSWORD'] = config('database.connections.mysql.password');
-                $askForMySQLPassword = $this->confirm(__('commands.database_settings.DB_PASSWORD_note'));
+                $askForMySQLPassword = $this->confirm(trans('commands.database_settings.DB_PASSWORD_note'));
             }
 
             if ($askForMySQLPassword) {
@@ -82,12 +91,85 @@ class DatabaseSettingsCommand extends Command
             }
 
             try {
-                $this->testMySQLConnection();
+                // Test connection
+                config()->set('database.connections._panel_command_test', [
+                    'driver' => 'mysql',
+                    'host' => $this->variables['DB_HOST'],
+                    'port' => $this->variables['DB_PORT'],
+                    'database' => $this->variables['DB_DATABASE'],
+                    'username' => $this->variables['DB_USERNAME'],
+                    'password' => $this->variables['DB_PASSWORD'],
+                    'charset' => 'utf8mb4',
+                    'collation' => 'utf8mb4_unicode_ci',
+                    'strict' => true,
+                ]);
+
+                $this->database->connection('_panel_command_test')->getPdo();
             } catch (\PDOException $exception) {
                 $this->output->error(sprintf('Unable to connect to the MySQL server using the provided credentials. The error returned was "%s".', $exception->getMessage()));
-                $this->output->error(__('commands.database_settings.DB_error_2'));
+                $this->output->error(trans('commands.database_settings.DB_error_2'));
 
-                if ($this->confirm(__('commands.database_settings.go_back'))) {
+                if ($this->confirm(trans('commands.database_settings.go_back'))) {
+                    $this->database->disconnect('_panel_command_test');
+
+                    return $this->handle();
+                }
+
+                return 1;
+            }
+        } elseif ($this->variables['DB_CONNECTION'] === 'mariadb') {
+            $this->output->note(trans('commands.database_settings.DB_HOST_note'));
+            $this->variables['DB_HOST'] = $this->option('host') ?? $this->ask(
+                'Database Host',
+                config('database.connections.mariadb.host', '127.0.0.1')
+            );
+
+            $this->variables['DB_PORT'] = $this->option('port') ?? $this->ask(
+                'Database Port',
+                config('database.connections.mariadb.port', 3306)
+            );
+
+            $this->variables['DB_DATABASE'] = $this->option('database') ?? $this->ask(
+                'Database Name',
+                config('database.connections.mariadb.database', 'panel')
+            );
+
+            $this->output->note(trans('commands.database_settings.DB_USERNAME_note'));
+            $this->variables['DB_USERNAME'] = $this->option('username') ?? $this->ask(
+                'Database Username',
+                config('database.connections.mariadb.username', 'pelican')
+            );
+
+            $askForMariaDBPassword = true;
+            if (!empty(config('database.connections.mariadb.password')) && $this->input->isInteractive()) {
+                $this->variables['DB_PASSWORD'] = config('database.connections.mariadb.password');
+                $askForMariaDBPassword = $this->confirm(trans('commands.database_settings.DB_PASSWORD_note'));
+            }
+
+            if ($askForMariaDBPassword) {
+                $this->variables['DB_PASSWORD'] = $this->option('password') ?? $this->secret('Database Password');
+            }
+
+            try {
+                // Test connection
+                config()->set('database.connections._panel_command_test', [
+                    'driver' => 'mariadb',
+                    'host' => $this->variables['DB_HOST'],
+                    'port' => $this->variables['DB_PORT'],
+                    'database' => $this->variables['DB_DATABASE'],
+                    'username' => $this->variables['DB_USERNAME'],
+                    'password' => $this->variables['DB_PASSWORD'],
+                    'charset' => 'utf8mb4',
+                    'collation' => 'utf8mb4_unicode_ci',
+                    'strict' => true,
+                ]);
+
+                $this->database->connection('_panel_command_test')->getPdo();
+            } catch (\PDOException $exception) {
+                $this->output->error(sprintf('Unable to connect to the MariaDB server using the provided credentials. The error returned was "%s".', $exception->getMessage()));
+                $this->output->error(trans('commands.database_settings.DB_error_2'));
+
+                if ($this->confirm(trans('commands.database_settings.go_back'))) {
                     $this->database->disconnect('_panel_command_test');
 
                     return $this->handle();
@@ -98,7 +180,7 @@ class DatabaseSettingsCommand extends Command
         } elseif ($this->variables['DB_CONNECTION'] === 'sqlite') {
             $this->variables['DB_DATABASE'] = $this->option('database') ?? $this->ask(
                 'Database Path',
-                config('database.connections.sqlite.database', database_path('database.sqlite'))
+                (string) env('DB_DATABASE', 'database.sqlite')
             );
         }
 
@@ -108,24 +190,4 @@ class DatabaseSettingsCommand extends Command
 
         return 0;
     }
-
-    /**
-     * Test that we can connect to the provided MySQL instance and perform a selection.
-     */
-    private function testMySQLConnection()
-    {
-        config()->set('database.connections._panel_command_test', [
-            'driver' => 'mysql',
-            'host' => $this->variables['DB_HOST'],
-            'port' => $this->variables['DB_PORT'],
-            'database' => $this->variables['DB_DATABASE'],
-            'username' => $this->variables['DB_USERNAME'],
-            'password' => $this->variables['DB_PASSWORD'],
-            'charset' => 'utf8mb4',
-            'collation' => 'utf8mb4_unicode_ci',
-            'strict' => true,
-        ]);
-
-        $this->database->connection('_panel_command_test')->getPdo();
-    }
 }

app/Console/Commands/Environment/EmailSettingsCommand.php

@@ -2,8 +2,8 @@
 
 namespace App\Console\Commands\Environment;
 
+use App\Traits\EnvironmentWriterTrait;
 use Illuminate\Console\Command;
-use App\Traits\Commands\EnvironmentWriterTrait;
 
 class EmailSettingsCommand extends Command
 {
@@ -22,6 +22,7 @@ class EmailSettingsCommand extends Command
                             {--username=}
                             {--password=}';
 
+    /** @var array<array-key, mixed> */
     protected array $variables = [];
 
     /**
@@ -61,6 +62,8 @@ class EmailSettingsCommand extends Command
 
         $this->writeToEnvironment($this->variables);
 
+        $this->call('queue:restart');
+
         $this->line('Updating stored environment configuration file.');
         $this->line('');
     }
@@ -68,7 +71,7 @@ class EmailSettingsCommand extends Command
     /**
      * Handle variables for SMTP driver.
      */
-    private function setupSmtpDriverVariables()
+    private function setupSmtpDriverVariables(): void
     {
         $this->variables['MAIL_HOST'] = $this->option('host') ?? $this->ask(
             trans('command/messages.environment.mail.ask_smtp_host'),
@@ -89,7 +92,7 @@ class EmailSettingsCommand extends Command
             trans('command/messages.environment.mail.ask_smtp_password')
         );
 
-        $this->variables['MAIL_ENCRYPTION'] = $this->option('encryption') ?? $this->choice(
+        $this->variables['MAIL_SCHEME'] = $this->option('encryption') ?? $this->choice(
             trans('command/messages.environment.mail.ask_encryption'),
             ['tls' => 'TLS', 'ssl' => 'SSL', '' => 'None'],
             config('mail.mailers.smtp.encryption', 'tls')
@@ -99,7 +102,7 @@ class EmailSettingsCommand extends Command
     /**
      * Handle variables for mailgun driver.
      */
-    private function setupMailgunDriverVariables()
+    private function setupMailgunDriverVariables(): void
     {
         $this->variables['MAILGUN_DOMAIN'] = $this->option('host') ?? $this->ask(
             trans('command/messages.environment.mail.ask_mailgun_domain'),
@@ -120,7 +123,7 @@ class EmailSettingsCommand extends Command
     /**
      * Handle variables for mandrill driver.
      */
-    private function setupMandrillDriverVariables()
+    private function setupMandrillDriverVariables(): void
     {
         $this->variables['MANDRILL_SECRET'] = $this->option('password') ?? $this->ask(
             trans('command/messages.environment.mail.ask_mandrill_secret'),
@@ -131,7 +134,7 @@ class EmailSettingsCommand extends Command
     /**
      * Handle variables for postmark driver.
      */
-    private function setupPostmarkDriverVariables()
+    private function setupPostmarkDriverVariables(): void
     {
         $this->variables['MAIL_DRIVER'] = 'smtp';
         $this->variables['MAIL_HOST'] = 'smtp.postmarkapp.com';

app/Console/Commands/Environment/QueueSettingsCommand.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Console\Commands\Environment;
+
+use App\Traits\Commands\RequestRedisSettingsTrait;
+use App\Traits\EnvironmentWriterTrait;
+use Illuminate\Console\Command;
+use Illuminate\Contracts\Console\Kernel;
+
+class QueueSettingsCommand extends Command
+{
+    use EnvironmentWriterTrait;
+    use RequestRedisSettingsTrait;
+
+    public const QUEUE_DRIVERS = [
+        'database' => 'Database (default)',
+        'redis' => 'Redis',
+        'sync' => 'Synchronous',
+    ];
+
+    protected $description = 'Configure queue settings for the Panel.';
+
+    protected $signature = 'p:environment:queue
+                            {--driver= : The queue driver backend to use.}
+                            {--redis-host= : Redis host to use for connections.}
+                            {--redis-user= : User used to connect to redis.}
+                            {--redis-pass= : Password used to connect to redis.}
+                            {--redis-port= : Port to connect to redis over.}';
+
+    /**
+     * QueueSettingsCommand constructor.
+     */
+    public function __construct(private Kernel $console)
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Handle command execution.
+     */
+    public function handle(): int
+    {
+        $selected = config('queue.default', 'database');
+        $this->variables['QUEUE_CONNECTION'] = $this->option('driver') ?? $this->choice(
+            'Queue Driver',
+            self::QUEUE_DRIVERS,
+            array_key_exists($selected, self::QUEUE_DRIVERS) ? $selected : null
+        );
+
+        if ($this->variables['QUEUE_CONNECTION'] === 'redis') {
+            $this->requestRedisSettings();
+
+            $this->call('p:environment:queue-service', [
+                '--overwrite' => true,
+            ]);
+        }
+
+        $this->writeToEnvironment($this->variables);
+
+        $this->info($this->console->output());
+
+        return 0;
+    }
+}

app/Console/Commands/Environment/QueueWorkerServiceCommand.php

@@ -14,24 +14,37 @@ class QueueWorkerServiceCommand extends Command
         {--service-name= : Name of the queue worker service.}
         {--user= : The user that PHP runs under.}
         {--group= : The group that PHP runs under.}
-        {--use-redis : Whether redis is used.}
         {--overwrite : Force overwrite if the service file already exists.}';
 
     public function handle(): void
     {
-        $serviceName = $this->option('service-name') ?? $this->ask('Service name', 'pelican-queue');
+        if (@file_exists('/.dockerenv')) {
+            $result = Process::run('supervisorctl restart queue-worker');
+            if ($result->failed()) {
+                $this->error('Error restarting service: ' . $result->errorOutput());
+
+                return;
+            }
+            $this->line('Queue worker service file updated successfully.');
+
+            return;
+        }
+        $serviceName = $this->option('service-name') ?? $this->ask('Queue worker service name', 'pelican-queue');
         $path = '/etc/systemd/system/' . $serviceName  . '.service';
 
-        if (file_exists($path) && !$this->option('overwrite') && !$this->confirm('The service file already exists. Do you want to overwrite it?')) {
-            $this->line('Creation of queue worker service file aborted.');
+        $fileExists = @file_exists($path);
+        if ($fileExists && !$this->option('overwrite') && !$this->confirm('The service file already exists. Do you want to overwrite it?')) {
+            $this->line('Creation of queue worker service file aborted because service file already exists.');
 
             return;
         }
 
-        $user = $this->option('user') ?? $this->ask('User', 'www-data');
-        $group = $this->option('group') ?? $this->ask('Group', 'www-data');
+        $user = $this->option('user') ?? $this->ask('Webserver User', 'www-data');
+        $group = $this->option('group') ?? $this->ask('Webserver Group', 'www-data');
 
-        $afterRedis = $this->option('use-redis') ? '\nAfter=redis-server.service' : '';
+        $redisUsed = config('queue.default') === 'redis' || config('session.driver') === 'redis' || config('cache.default') === 'redis';
+        $afterRedis = $redisUsed ? '
+After=redis-server.service' : '';
 
         $basePath = base_path();
 
@@ -45,7 +58,7 @@ Description=Pelican Queue Service$afterRedis
 User=$user
 Group=$group
 Restart=always
-ExecStart=/usr/bin/php $basePath/artisan queue:work --queue=high,standard,low --tries=3
+ExecStart=/usr/bin/php $basePath/artisan queue:work --tries=3
 StartLimitInterval=180
 StartLimitBurst=30
 RestartSec=5s
@@ -60,13 +73,24 @@ WantedBy=multi-user.target
             return;
         }
 
-        $result = Process::run("systemctl enable --now $serviceName.service");
-        if ($result->failed()) {
-            $this->error('Error enabling service: ' . $result->errorOutput());
+        if ($fileExists) {
+            $result = Process::run("systemctl restart $serviceName.service");
+            if ($result->failed()) {
+                $this->error('Error restarting service: ' . $result->errorOutput());
 
-            return;
+                return;
+            }
+
+            $this->line('Queue worker service file updated successfully.');
+        } else {
+            $result = Process::run("systemctl enable --now $serviceName.service");
+            if ($result->failed()) {
+                $this->error('Error enabling service: ' . $result->errorOutput());
+
+                return;
+            }
+
+            $this->line('Queue worker service file created successfully.');
         }
-
-        $this->line('Queue worker service file created successfully.');
     }
 }

app/Console/Commands/Environment/RedisSetupCommand.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Console\Commands\Environment;
+
+use App\Traits\Commands\RequestRedisSettingsTrait;
+use App\Traits\EnvironmentWriterTrait;
+use Illuminate\Console\Command;
+use Illuminate\Contracts\Console\Kernel;
+
+class RedisSetupCommand extends Command
+{
+    use EnvironmentWriterTrait;
+    use RequestRedisSettingsTrait;
+
+    protected $description = 'Configure the Panel to use Redis as cache, queue and session driver.';
+
+    protected $signature = 'p:redis:setup
+                            {--redis-host= : Redis host to use for connections.}
+                            {--redis-user= : User used to connect to redis.}
+                            {--redis-pass= : Password used to connect to redis.}
+                            {--redis-port= : Port to connect to redis over.}';
+
+    /**
+     * RedisSetupCommand constructor.
+     */
+    public function __construct(private Kernel $console)
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Handle command execution.
+     */
+    public function handle(): int
+    {
+        $this->variables['CACHE_STORE'] = 'redis';
+        $this->variables['QUEUE_CONNECTION'] = 'redis';
+        $this->variables['SESSION_DRIVER'] = 'redis';
+
+        $this->requestRedisSettings();
+
+        $this->call('p:environment:queue-service', [
+            '--overwrite' => true,
+        ]);
+
+        $this->writeToEnvironment($this->variables);
+
+        $this->info($this->console->output());
+
+        return 0;
+    }
+}

app/Console/Commands/Environment/SessionSettingsCommand.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Console\Commands\Environment;
+
+use App\Traits\Commands\RequestRedisSettingsTrait;
+use App\Traits\EnvironmentWriterTrait;
+use Illuminate\Console\Command;
+use Illuminate\Contracts\Console\Kernel;
+
+class SessionSettingsCommand extends Command
+{
+    use EnvironmentWriterTrait;
+    use RequestRedisSettingsTrait;
+
+    public const SESSION_DRIVERS = [
+        'file' => 'Filesystem (default)',
+        'redis' => 'Redis',
+        'database' => 'Database',
+        'cookie' => 'Cookie',
+    ];
+
+    protected $description = 'Configure session settings for the Panel.';
+
+    protected $signature = 'p:environment:session
+                            {--driver= : The session driver backend to use.}
+                            {--redis-host= : Redis host to use for connections.}
+                            {--redis-user= : User used to connect to redis.}
+                            {--redis-pass= : Password used to connect to redis.}
+                            {--redis-port= : Port to connect to redis over.}';
+
+    /**
+     * SessionSettingsCommand constructor.
+     */
+    public function __construct(private Kernel $console)
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Handle command execution.
+     */
+    public function handle(): int
+    {
+        $selected = config('session.driver', 'file');
+        $this->variables['SESSION_DRIVER'] = $this->option('driver') ?? $this->choice(
+            'Session Driver',
+            self::SESSION_DRIVERS,
+            array_key_exists($selected, self::SESSION_DRIVERS) ? $selected : null
+        );
+
+        if ($this->variables['SESSION_DRIVER'] === 'redis') {
+            $this->requestRedisSettings();
+
+            if (config('queue.default') !== 'sync') {
+                $this->call('p:environment:queue-service', [
+                    '--overwrite' => true,
+                ]);
+            }
+        }
+
+        $this->writeToEnvironment($this->variables);
+
+        $this->info($this->console->output());
+
+        return 0;
+    }
+}

app/Console/Commands/InfoCommand.php

@@ -3,75 +3,15 @@
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
-use App\Services\Helpers\SoftwareVersionService;
 
 class InfoCommand extends Command
 {
-    protected $description = 'Displays the application, database, and email configurations along with the panel version.';
+    protected $description = 'Displays the application, database, email and backup configurations along with the panel version.';
 
     protected $signature = 'p:info';
 
-    /**
-     * VersionCommand constructor.
-     */
-    public function __construct(private SoftwareVersionService $versionService)
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Handle execution of command.
-     */
     public function handle(): void
     {
-        $this->output->title('Version Information');
-        $this->table([], [
-            ['Panel Version', config('app.version')],
-            ['Latest Version', $this->versionService->getPanel()],
-            ['Up-to-Date', $this->versionService->isLatestPanel() ? 'Yes' : $this->formatText('No', 'bg=red')],
-        ], 'compact');
-
-        $this->output->title('Application Configuration');
-        $this->table([], [
-            ['Environment', $this->formatText(config('app.env'), config('app.env') === 'production' ?: 'bg=red')],
-            ['Debug Mode', $this->formatText(config('app.debug') ? 'Yes' : 'No', !config('app.debug') ?: 'bg=red')],
-            ['Installation URL', config('app.url')],
-            ['Installation Directory', base_path()],
-            ['Cache Driver', config('cache.default')],
-            ['Queue Driver', config('queue.default')],
-            ['Session Driver', config('session.driver')],
-            ['Filesystem Driver', config('filesystems.default')],
-            ['Default Theme', config('themes.active')],
-        ], 'compact');
-
-        $this->output->title('Database Configuration');
-        $driver = config('database.default');
-        $this->table([], [
-            ['Driver', $driver],
-            ['Host', config("database.connections.$driver.host")],
-            ['Port', config("database.connections.$driver.port")],
-            ['Database', config("database.connections.$driver.database")],
-            ['Username', config("database.connections.$driver.username")],
-        ], 'compact');
-
-        // TODO: Update this to handle other mail drivers
-        $this->output->title('Email Configuration');
-        $this->table([], [
-            ['Driver', config('mail.default')],
-            ['Host', config('mail.mailers.smtp.host')],
-            ['Port', config('mail.mailers.smtp.port')],
-            ['Username', config('mail.mailers.smtp.username')],
-            ['From Address', config('mail.from.address')],
-            ['From Name', config('mail.from.name')],
-            ['Encryption', config('mail.mailers.smtp.encryption')],
-        ], 'compact');
-    }
-
-    /**
-     * Format output in a Name: Value manner.
-     */
-    private function formatText(string $value, string $opts = ''): string
-    {
-        return sprintf('<%s>%s</>', $opts, $value);
+        $this->call('about');
     }
 }

app/Console/Commands/Maintenance/CleanServiceBackupFilesCommand.php

@@ -6,6 +6,7 @@ use Carbon\Carbon;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Filesystem\Filesystem;
 use Illuminate\Contracts\Filesystem\Factory as FilesystemFactory;
+use SplFileInfo;
 
 class CleanServiceBackupFilesCommand extends Command
 {
@@ -32,9 +33,10 @@ class CleanServiceBackupFilesCommand extends Command
      */
     public function handle(): void
     {
+        /** @var SplFileInfo[] */
         $files = $this->disk->files('services/.bak');
 
-        collect($files)->each(function (\SplFileInfo $file) {
+        collect($files)->each(function ($file) {
             $lastModified = Carbon::createFromTimestamp($this->disk->lastModified($file->getPath()));
             if ($lastModified->diffInMinutes(Carbon::now()) > self::BACKUP_THRESHOLD_MINUTES) {
                 $this->disk->delete($file->getPath());

app/Console/Commands/Maintenance/PruneImagesCommand.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Console\Commands\Maintenance;
+
+use App\Models\Node;
+use Exception;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Http;
+
+class PruneImagesCommand extends Command
+{
+    protected $signature = 'p:maintenance:prune-images {node?}';
+
+    protected $description = 'Clean up all dangling docker images to clear up disk space.';
+
+    public function handle(): void
+    {
+        $node = $this->argument('node');
+
+        if (empty($node)) {
+            $nodes = Node::all();
+            /** @var Node $node */
+            foreach ($nodes as $node) {
+                $this->cleanupImages($node);
+            }
+        } else {
+            $this->cleanupImages((int) $node);
+        }
+    }
+
+    private function cleanupImages(int|Node $node): void
+    {
+        if (!$node instanceof Node) {
+            $node = Node::query()->findOrFail($node);
+        }
+
+        try {
+            $response = Http::daemon($node)
+                ->connectTimeout(5)
+                ->timeout(30)
+                ->delete('/api/system/docker/image/prune')
+                ->json() ?? [];
+
+            if (empty($response) || $response['ImagesDeleted'] === null) {
+                $this->warn("Node {$node->id}: No images to clean up.");
+
+                return;
+            }
+
+            $count = count($response['ImagesDeleted']);
+
+            $useBinaryPrefix = config('panel.use_binary_prefix');
+            $space = round($useBinaryPrefix ? $response['SpaceReclaimed'] / 1024 / 1024 : $response['SpaceReclaimed'] / 1000 / 1000, 2) . ($useBinaryPrefix ? ' MiB' : ' MB');
+
+            $this->info("Node {$node->id}: Cleaned up {$count} dangling docker images. ({$space})");
+        } catch (Exception $exception) {
+            $this->error($exception->getMessage());
+        }
+    }
+}

app/Console/Commands/Node/MakeNodeCommand.php

@@ -2,8 +2,8 @@
 
 namespace App\Console\Commands\Node;
 
+use App\Models\Node;
 use Illuminate\Console\Command;
-use App\Services\Nodes\NodeCreationService;
 
 class MakeNodeCommand extends Command
 {
@@ -24,19 +24,13 @@ class MakeNodeCommand extends Command
                             {--overallocateCpu= : Enter the amount of cpu to overallocate (% or -1 to overallocate the maximum).}
                             {--uploadSize= : Enter the maximum upload filesize.}
                             {--daemonListeningPort= : Enter the daemon listening port.}
+                            {--daemonConnectingPort= : Enter the daemon connecting port.}
                             {--daemonSFTPPort= : Enter the daemon SFTP listening port.}
+                            {--daemonSFTPAlias= : Enter the daemon SFTP alias.}
                             {--daemonBase= : Enter the base folder.}';
 
     protected $description = 'Creates a new node on the system via the CLI.';
 
-    /**
-     * MakeNodeCommand constructor.
-     */
-    public function __construct(private NodeCreationService $creationService)
-    {
-        parent::__construct();
-    }
-
     /**
      * Handle the command execution process.
      *
@@ -44,30 +38,32 @@ class MakeNodeCommand extends Command
      */
     public function handle(): void
     {
-        $data['name'] = $this->option('name') ?? $this->ask(__('commands.make_node.name'));
-        $data['description'] = $this->option('description') ?? $this->ask(__('commands.make_node.description'));
+        $data['name'] = $this->option('name') ?? $this->ask(trans('commands.make_node.name'));
+        $data['description'] = $this->option('description') ?? $this->ask(trans('commands.make_node.description'));
         $data['scheme'] = $this->option('scheme') ?? $this->anticipate(
-            __('commands.make_node.scheme'),
+            trans('commands.make_node.scheme'),
             ['https', 'http'],
             'https'
         );
 
-        $data['fqdn'] = $this->option('fqdn') ?? $this->ask(__('commands.make_node.fqdn'));
-        $data['public'] = $this->option('public') ?? $this->confirm(__('commands.make_node.public'), true);
-        $data['behind_proxy'] = $this->option('proxy') ?? $this->confirm(__('commands.make_node.behind_proxy'));
-        $data['maintenance_mode'] = $this->option('maintenance') ?? $this->confirm(__('commands.make_node.maintenance_mode'));
-        $data['memory'] = $this->option('maxMemory') ?? $this->ask(__('commands.make_node.memory'));
-        $data['memory_overallocate'] = $this->option('overallocateMemory') ?? $this->ask(__('commands.make_node.memory_overallocate'));
-        $data['disk'] = $this->option('maxDisk') ?? $this->ask(__('commands.make_node.disk'));
-        $data['disk_overallocate'] = $this->option('overallocateDisk') ?? $this->ask(__('commands.make_node.disk_overallocate'));
-        $data['cpu'] = $this->option('maxCpu') ?? $this->ask(__('commands.make_node.cpu'));
-        $data['cpu_overallocate'] = $this->option('overallocateCpu') ?? $this->ask(__('commands.make_node.cpu_overallocate'));
-        $data['upload_size'] = $this->option('uploadSize') ?? $this->ask(__('commands.make_node.upload_size'), '100');
-        $data['daemon_listen'] = $this->option('daemonListeningPort') ?? $this->ask(__('commands.make_node.daemonListen'), '8080');
-        $data['daemon_sftp'] = $this->option('daemonSFTPPort') ?? $this->ask(__('commands.make_node.daemonSFTP'), '2022');
-        $data['daemon_base'] = $this->option('daemonBase') ?? $this->ask(__('commands.make_node.daemonBase'), '/var/lib/pelican/volumes');
+        $data['fqdn'] = $this->option('fqdn') ?? $this->ask(trans('commands.make_node.fqdn'));
+        $data['public'] = $this->option('public') ?? $this->confirm(trans('commands.make_node.public'), true);
+        $data['behind_proxy'] = $this->option('proxy') ?? $this->confirm(trans('commands.make_node.behind_proxy'));
+        $data['maintenance_mode'] = $this->option('maintenance') ?? $this->confirm(trans('commands.make_node.maintenance_mode'));
+        $data['memory'] = $this->option('maxMemory') ?? $this->ask(trans('commands.make_node.memory'), '0');
+        $data['memory_overallocate'] = $this->option('overallocateMemory') ?? $this->ask(trans('commands.make_node.memory_overallocate'), '-1');
+        $data['disk'] = $this->option('maxDisk') ?? $this->ask(trans('commands.make_node.disk'), '0');
+        $data['disk_overallocate'] = $this->option('overallocateDisk') ?? $this->ask(trans('commands.make_node.disk_overallocate'), '-1');
+        $data['cpu'] = $this->option('maxCpu') ?? $this->ask(trans('commands.make_node.cpu'), '0');
+        $data['cpu_overallocate'] = $this->option('overallocateCpu') ?? $this->ask(trans('commands.make_node.cpu_overallocate'), '-1');
+        $data['upload_size'] = $this->option('uploadSize') ?? $this->ask(trans('commands.make_node.upload_size'), '256');
+        $data['daemon_listen'] = $this->option('daemonListeningPort') ?? $this->ask(trans('commands.make_node.daemonListen'), '8080');
+        $data['daemon_connect'] = $this->option('daemonConnectingPort') ?? $this->ask(trans('commands.make_node.daemonConnect'), '8080');
+        $data['daemon_sftp'] = $this->option('daemonSFTPPort') ?? $this->ask(trans('commands.make_node.daemonSFTP'), '2022');
+        $data['daemon_sftp_alias'] = $this->option('daemonSFTPAlias') ?? $this->ask(trans('commands.make_node.daemonSFTPAlias'), '');
+        $data['daemon_base'] = $this->option('daemonBase') ?? $this->ask(trans('commands.make_node.daemonBase'), '/var/lib/pelican/volumes');
 
-        $node = $this->creationService->handle($data);
-        $this->line(__('commands.make_node.succes1') . $data['name'] . __('commands.make_node.succes2')  . $node->id . '.');
+        $node = Node::create($data);
+        $this->line(trans('commands.make_node.success', ['name' => $data['name'], 'id' => $node->id]));
     }
 }

app/Console/Commands/Node/NodeConfigurationCommand.php

@@ -19,14 +19,14 @@ class NodeConfigurationCommand extends Command
 
         /** @var \App\Models\Node $node */
         $node = Node::query()->where($column, $this->argument('node'))->firstOr(function () {
-            $this->error(__('commands.node_config.error_not_exist'));
+            $this->error(trans('commands.node_config.error_not_exist'));
 
             exit(1);
         });
 
         $format = $this->option('format');
         if (!in_array($format, ['yaml', 'yml', 'json'])) {
-            $this->error(__('commands.node_config.error_invalid_format'));
+            $this->error(trans('commands.node_config.error_invalid_format'));
 
             return 1;
         }

app/Console/Commands/Overrides/KeyGenerateCommand.php

@@ -13,12 +13,12 @@ class KeyGenerateCommand extends BaseKeyGenerateCommand
     public function handle(): void
     {
         if (!empty(config('app.key')) && $this->input->isInteractive()) {
-            $this->output->warning(__('commands.key_generate.error_already_exist'));
-            if (!$this->confirm(__('commands.key_generate.understand'))) {
+            $this->output->warning(trans('commands.key_generate.error_already_exist'));
+            if (!$this->confirm(trans('commands.key_generate.understand'))) {
                 return;
             }
 
-            if (!$this->confirm(__('commands.key_generate.continue'))) {
+            if (!$this->confirm(trans('commands.key_generate.continue'))) {
                 return;
             }
         }

app/Console/Commands/Overrides/SeedCommand.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands\Overrides;
 
-use App\Console\RequiresDatabaseMigrations;
+use App\Traits\Commands\RequiresDatabaseMigrations;
 use Illuminate\Database\Console\Seeds\SeedCommand as BaseSeedCommand;
 
 class SeedCommand extends BaseSeedCommand

app/Console/Commands/Overrides/UpCommand.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands\Overrides;
 
-use App\Console\RequiresDatabaseMigrations;
+use App\Traits\Commands\RequiresDatabaseMigrations;
 use Illuminate\Foundation\Console\UpCommand as BaseUpCommand;
 
 class UpCommand extends BaseUpCommand

app/Console/Commands/Schedule/ProcessRunnableCommand.php

@@ -6,7 +6,7 @@ use Illuminate\Console\Command;
 use App\Models\Schedule;
 use Illuminate\Database\Eloquent\Builder;
 use App\Services\Schedules\ProcessScheduleService;
-use Carbon\Carbon;
+use Throwable;
 
 class ProcessRunnableCommand extends Command
 {
@@ -14,21 +14,18 @@ class ProcessRunnableCommand extends Command
 
     protected $description = 'Process schedules in the database and determine which are ready to run.';
 
-    /**
-     * Handle command execution.
-     */
-    public function handle(): int
+    public function handle(ProcessScheduleService $processScheduleService): int
     {
         $schedules = Schedule::query()
             ->with('tasks')
             ->whereRelation('server', fn (Builder $builder) => $builder->whereNull('status'))
             ->where('is_active', true)
             ->where('is_processing', false)
-            ->whereDate('next_run_at', '<=', Carbon::now()->toDateString())
+            ->where('next_run_at', '<=', now('UTC')->toDateTimeString())
             ->get();
 
         if ($schedules->count() < 1) {
-            $this->line(__('commands.schedule.process.no_tasks'));
+            $this->line(trans('commands.schedule.process.no_tasks'));
 
             return 0;
         }
@@ -36,7 +33,7 @@ class ProcessRunnableCommand extends Command
         $bar = $this->output->createProgressBar(count($schedules));
         foreach ($schedules as $schedule) {
             $bar->clear();
-            $this->processSchedule($schedule);
+            $this->processSchedule($processScheduleService, $schedule);
             $bar->advance();
             $bar->display();
         }
@@ -51,23 +48,23 @@ class ProcessRunnableCommand extends Command
      * never throw an exception out, otherwise you'll end up killing the entire run group causing
      * any other schedules to not process correctly.
      */
-    protected function processSchedule(Schedule $schedule)
+    protected function processSchedule(ProcessScheduleService $processScheduleService, Schedule $schedule): void
     {
         if ($schedule->tasks->isEmpty()) {
             return;
         }
 
         try {
-            $this->getLaravel()->make(ProcessScheduleService::class)->handle($schedule);
+            $processScheduleService->handle($schedule);
 
             $this->line(trans('command/messages.schedule.output_line', [
                 'schedule' => $schedule->name,
                 'id' => $schedule->id,
             ]));
-        } catch (\Throwable|\Exception $exception) {
+        } catch (Throwable $exception) {
             logger()->error($exception, ['schedule_id' => $schedule->id]);
 
-            $this->error(__('commands.schedule.process.no_tasks') . " #$schedule->id: " . $exception->getMessage());
+            $this->error(trans('commands.schedule.process.no_tasks') . " #$schedule->id: " . $exception->getMessage());
         }
     }
 }

app/Console/Commands/Server/BulkPowerActionCommand.php

@@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Validation\ValidationException;
 use Illuminate\Validation\Factory as ValidatorFactory;
 use App\Repositories\Daemon\DaemonPowerRepository;
-use App\Exceptions\Http\Connection\DaemonConnectionException;
+use Exception;
 
 class BulkPowerActionCommand extends Command
 {
@@ -19,26 +19,13 @@ class BulkPowerActionCommand extends Command
 
     protected $description = 'Perform bulk power management on large groupings of servers or nodes at once.';
 
-    /**
-     * BulkPowerActionCommand constructor.
-     */
-    public function __construct(private DaemonPowerRepository $powerRepository, private ValidatorFactory $validator)
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Handle the bulk power request.
-     *
-     * @throws \Illuminate\Validation\ValidationException
-     */
-    public function handle(): void
+    public function handle(DaemonPowerRepository $powerRepository, ValidatorFactory $validator): void
     {
         $action = $this->argument('action');
         $nodes = empty($this->option('nodes')) ? [] : explode(',', $this->option('nodes'));
         $servers = empty($this->option('servers')) ? [] : explode(',', $this->option('servers'));
 
-        $validator = $this->validator->make([
+        $validator = $validator->make([
             'action' => $action,
             'nodes' => $nodes,
             'servers' => $servers,
@@ -64,13 +51,17 @@ class BulkPowerActionCommand extends Command
         }
 
         $bar = $this->output->createProgressBar($count);
-        $powerRepository = $this->powerRepository;
-        $this->getQueryBuilder($servers, $nodes)->each(function (Server $server) use ($action, $powerRepository, &$bar) {
+
+        $this->getQueryBuilder($servers, $nodes)->get()->each(function ($server, int $index) use ($action, $powerRepository, &$bar): mixed {
             $bar->clear();
 
+            if (!$server instanceof Server) {
+                return null;
+            }
+
             try {
                 $powerRepository->setServer($server)->send($action);
-            } catch (DaemonConnectionException $exception) {
+            } catch (Exception $exception) {
                 $this->output->error(trans('command/messages.server.power.action_failed', [
                     'name' => $server->name,
                     'id' => $server->id,
@@ -81,6 +72,8 @@ class BulkPowerActionCommand extends Command
 
             $bar->advance();
             $bar->display();
+
+            return null;
         });
 
         $this->line('');
@@ -88,6 +81,9 @@ class BulkPowerActionCommand extends Command
 
     /**
      * Returns the query builder instance that will return the servers that should be affected.
+     *
+     * @param  string[]|int[]  $servers
+     * @param  string[]|int[]  $nodes
      */
     protected function getQueryBuilder(array $servers, array $nodes): Builder
     {

app/Console/Commands/UpgradeCommand.php

@@ -34,30 +34,26 @@ class UpgradeCommand extends Command
     {
         $skipDownload = $this->option('skip-download');
         if (!$skipDownload) {
-            $this->output->warning(__('commands.upgrade.integrity'));
-            $this->output->comment(__('commands.upgrade.source_url'));
+            $this->output->warning(trans('commands.upgrade.integrity'));
+            $this->output->comment(trans('commands.upgrade.source_url'));
             $this->line($this->getUrl());
         }
 
-        if (version_compare(PHP_VERSION, '7.4.0') < 0) {
-            $this->error(__('commands.upgrade.php_version') . ' [' . PHP_VERSION . '].');
-        }
-
         $user = 'www-data';
         $group = 'www-data';
         if ($this->input->isInteractive()) {
             if (!$skipDownload) {
-                $skipDownload = !$this->confirm(__('commands.upgrade.skipDownload'), true);
+                $skipDownload = !$this->confirm(trans('commands.upgrade.skipDownload'), true);
             }
 
             if (is_null($this->option('user'))) {
                 $userDetails = function_exists('posix_getpwuid') ? posix_getpwuid(fileowner('public')) : [];
                 $user = $userDetails['name'] ?? 'www-data';
 
-                $message = __('commands.upgrade.webserver_user', ['user' => $user]);
+                $message = trans('commands.upgrade.webserver_user', ['user' => $user]);
                 if (!$this->confirm($message, true)) {
                     $user = $this->anticipate(
-                        __('commands.upgrade.name_webserver'),
+                        trans('commands.upgrade.name_webserver'),
                         [
                             'www-data',
                             'nginx',
@@ -71,10 +67,10 @@ class UpgradeCommand extends Command
                 $groupDetails = function_exists('posix_getgrgid') ? posix_getgrgid(filegroup('public')) : [];
                 $group = $groupDetails['name'] ?? 'www-data';
 
-                $message = __('commands.upgrade.group_webserver', ['group' => $user]);
+                $message = trans('commands.upgrade.group_webserver', ['group' => $user]);
                 if (!$this->confirm($message, true)) {
                     $group = $this->anticipate(
-                        __('commands.upgrade.group_webserver_question'),
+                        trans('commands.upgrade.group_webserver_question'),
                         [
                             'www-data',
                             'nginx',
@@ -84,8 +80,8 @@ class UpgradeCommand extends Command
                 }
             }
 
-            if (!$this->confirm(__('commands.upgrade.are_your_sure'))) {
-                $this->warn(__('commands.upgrade.terminated'));
+            if (!$this->confirm(trans('commands.upgrade.are_your_sure'))) {
+                $this->warn(trans('commands.upgrade.terminated'));
 
                 return;
             }
@@ -175,10 +171,10 @@ class UpgradeCommand extends Command
         });
 
         $this->newLine(2);
-        $this->info(__('commands.upgrade.success'));
+        $this->info(trans('commands.upgrade.success'));
     }
 
-    protected function withProgress(ProgressBar $bar, \Closure $callback)
+    protected function withProgress(ProgressBar $bar, \Closure $callback): void
     {
         $bar->clear();
         $callback();

app/Console/Commands/User/DeleteUserCommand.php

@@ -15,7 +15,7 @@ class DeleteUserCommand extends Command
     public function handle(): int
     {
         $search = $this->option('user') ?? $this->ask(trans('command/messages.user.search_users'));
-        Assert::notEmpty($search, 'Search term should be an email address, got: %s.');
+        Assert::notEmpty($search, 'Search term should not be empty.');
 
         $results = User::query()
             ->where('id', 'LIKE', "$search%")
@@ -42,6 +42,8 @@ class DeleteUserCommand extends Command
             if (!$deleteUser = $this->ask(trans('command/messages.user.select_search_user'))) {
                 return $this->handle();
             }
+
+            $deleteUser = User::query()->findOrFail($deleteUser);
         } else {
             if (count($results) > 1) {
                 $this->error(trans('command/messages.user.multiple_found'));
@@ -53,8 +55,7 @@ class DeleteUserCommand extends Command
         }
 
         if ($this->confirm(trans('command/messages.user.confirm_delete')) || !$this->input->isInteractive()) {
-            $user = User::query()->findOrFail($deleteUser);
-            $user->delete();
+            $deleteUser->delete();
 
             $this->info(trans('command/messages.user.deleted'));
         }

app/Console/Commands/User/DisableTwoFactorCommand.php

@@ -19,7 +19,7 @@ class DisableTwoFactorCommand extends Command
     public function handle(): void
     {
         if ($this->input->isInteractive()) {
-            $this->output->warning(trans('command/messages.user.2fa_help_text'));
+            $this->output->warning(trans('command/messages.user.2fa_help_text.0') . trans('command/messages.user.2fa_help_text.1'));
         }
 
         $email = $this->option('email') ?? $this->ask(trans('command/messages.user.ask_email'));

app/Console/Commands/User/MakeUserCommand.php

@@ -30,7 +30,7 @@ class MakeUserCommand extends Command
     public function handle(): int
     {
         try {
-            DB::select('select 1 where 1');
+            DB::connection()->getPdo();
         } catch (Exception $exception) {
             $this->error($exception->getMessage());
 
@@ -52,7 +52,7 @@ class MakeUserCommand extends Command
             ['UUID', $user->uuid],
             ['Email', $user->email],
             ['Username', $user->username],
-            ['Admin', $user->root_admin ? 'Yes' : 'No'],
+            ['Admin', $user->isRootAdmin() ? 'Yes' : 'No'],
         ]);
 
         return 0;

app/Console/Kernel.php

@@ -2,13 +2,18 @@
 
 namespace App\Console;
 
+use App\Console\Commands\Egg\CheckEggUpdatesCommand;
+use App\Console\Commands\Maintenance\CleanServiceBackupFilesCommand;
+use App\Console\Commands\Maintenance\PruneImagesCommand;
+use App\Console\Commands\Maintenance\PruneOrphanedBackupsCommand;
+use App\Console\Commands\Schedule\ProcessRunnableCommand;
 use App\Models\ActivityLog;
+use App\Models\Webhook;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Database\Console\PruneCommand;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
-use App\Console\Commands\Schedule\ProcessRunnableCommand;
-use App\Console\Commands\Maintenance\PruneOrphanedBackupsCommand;
-use App\Console\Commands\Maintenance\CleanServiceBackupFilesCommand;
+use Spatie\Health\Commands\RunHealthChecksCommand;
+use Spatie\Health\Commands\ScheduleCheckHeartbeatCommand;
 
 class Kernel extends ConsoleKernel
 {
@@ -25,12 +30,18 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule): void
     {
-        // https://laravel.com/docs/10.x/upgrade#redis-cache-tags
-        $schedule->command('cache:prune-stale-tags')->hourly();
+        if (config('cache.default') === 'redis') {
+            // https://laravel.com/docs/10.x/upgrade#redis-cache-tags
+            // This only needs to run when using redis. anything else throws an error.
+            $schedule->command('cache:prune-stale-tags')->hourly();
+        }
 
         // Execute scheduled commands for servers every minute, as if there was a normal cron running.
         $schedule->command(ProcessRunnableCommand::class)->everyMinute()->withoutOverlapping();
+
         $schedule->command(CleanServiceBackupFilesCommand::class)->daily();
+        $schedule->command(PruneImagesCommand::class)->daily();
+        $schedule->command(CheckEggUpdatesCommand::class)->hourly();
 
         if (config('backups.prune_age')) {
             // Every 30 minutes, run the backup pruning command so that any abandoned backups can be deleted.
@@ -40,5 +51,12 @@ class Kernel extends ConsoleKernel
         if (config('activity.prune_days')) {
             $schedule->command(PruneCommand::class, ['--model' => [ActivityLog::class]])->daily();
         }
+
+        if (config('panel.webhook.prune_days')) {
+            $schedule->command(PruneCommand::class, ['--model' => [Webhook::class]])->daily();
+        }
+
+        $schedule->command(ScheduleCheckHeartbeatCommand::class)->everyMinute();
+        $schedule->command(RunHealthChecksCommand::class)->everyFiveMinutes();
     }
 }

app/Contracts/Validatable.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Contracts;
+
+use Illuminate\Validation\Validator;
+
+interface Validatable
+{
+    public function getValidator(): Validator;
+
+    /**
+     * @return array<string, mixed>
+     */
+    public static function getRules(): array;
+
+    /**
+     * @return array<string, array<string, mixed>>
+     */
+    public static function getRulesForField(string $field): array;
+
+    public function validate(): void;
+}

app/Eloquent/BackupQueryBuilder.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Eloquent;
+
+use Illuminate\Database\Eloquent\Builder;
+
+/**
+ * @template TModel of \Illuminate\Database\Eloquent\Model
+ *
+ * @extends Builder<TModel>
+ */
+class BackupQueryBuilder extends Builder
+{
+    public function nonFailed(): self
+    {
+        $this->where(function (Builder $query) {
+            $query
+                ->whereNull('completed_at')
+                ->orWhere('is_successful', true);
+        });
+
+        return $this;
+    }
+}

app/Enums/BackupStatus.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Enums;
+
+use Filament\Support\Contracts\HasColor;
+use Filament\Support\Contracts\HasIcon;
+use Filament\Support\Contracts\HasLabel;
+
+enum BackupStatus: string implements HasColor, HasIcon, HasLabel
+{
+    case InProgress = 'in_progress';
+    case Successful = 'successful';
+    case Failed = 'failed';
+
+    public function getIcon(): string
+    {
+        return match ($this) {
+            self::InProgress => 'tabler-circle-dashed',
+            self::Successful => 'tabler-circle-check',
+            self::Failed => 'tabler-circle-x',
+        };
+    }
+
+    public function getColor(): string
+    {
+        return match ($this) {
+            self::InProgress => 'primary',
+            self::Successful => 'success',
+            self::Failed => 'danger',
+        };
+    }
+
+    public function getLabel(): string
+    {
+        return str($this->value)->headline();
+    }
+}

app/Enums/ConsoleWidgetPosition.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Enums;
+
+enum ConsoleWidgetPosition: string
+{
+    case Top = 'top';
+    case AboveConsole = 'above_console';
+    case BelowConsole = 'below_console';
+    case Bottom = 'bottom';
+}

app/Enums/ContainerStatus.php

@@ -2,38 +2,58 @@
 
 namespace App\Enums;
 
-enum ContainerStatus: string
+use Filament\Support\Contracts\HasColor;
+use Filament\Support\Contracts\HasIcon;
+use Filament\Support\Contracts\HasLabel;
+
+enum ContainerStatus: string implements HasColor, HasIcon, HasLabel
 {
     // Docker Based
     case Created = 'created';
+    case Starting = 'starting';
     case Running = 'running';
     case Restarting = 'restarting';
     case Exited = 'exited';
     case Paused = 'paused';
     case Dead = 'dead';
     case Removing = 'removing';
+    case Stopping = 'stopping';
+    case Offline = 'offline';
 
     // HTTP Based
     case Missing = 'missing';
 
-    public function icon(): string
+    public function getIcon(): string
     {
         return match ($this) {
+
             self::Created => 'tabler-heart-plus',
+            self::Starting => 'tabler-heart-up',
             self::Running => 'tabler-heartbeat',
             self::Restarting => 'tabler-heart-bolt',
             self::Exited => 'tabler-heart-exclamation',
             self::Paused => 'tabler-heart-pause',
-            self::Dead => 'tabler-heart-x',
+            self::Dead, self::Offline => 'tabler-heart-x',
             self::Removing => 'tabler-heart-down',
-            self::Missing => 'tabler-heart-question',
+            self::Missing => 'tabler-heart-search',
+            self::Stopping => 'tabler-heart-minus',
         };
     }
 
-    public function color(): string
+    public function getColor(bool $hex = false): string
     {
+        if ($hex) {
+            return match ($this) {
+                self::Created, self::Restarting => '#2563EB',
+                self::Starting, self::Paused, self::Removing, self::Stopping => '#D97706',
+                self::Running => '#22C55E',
+                self::Exited, self::Missing, self::Dead, self::Offline => '#EF4444',
+            };
+        }
+
         return match ($this) {
             self::Created => 'primary',
+            self::Starting => 'warning',
             self::Running => 'success',
             self::Restarting => 'info',
             self::Exited => 'danger',
@@ -41,6 +61,54 @@ enum ContainerStatus: string
             self::Dead => 'danger',
             self::Removing => 'warning',
             self::Missing => 'danger',
+            self::Stopping => 'warning',
+            self::Offline => 'danger',
         };
     }
+
+    public function getLabel(): string
+    {
+        return str($this->value)->title();
+    }
+
+    public function isOffline(): bool
+    {
+        return in_array($this, [ContainerStatus::Offline, ContainerStatus::Missing]);
+    }
+
+    public function isStartingOrRunning(): bool
+    {
+        return in_array($this, [ContainerStatus::Starting, ContainerStatus::Running]);
+    }
+
+    public function isStartingOrStopping(): bool
+    {
+        return in_array($this, [ContainerStatus::Starting, ContainerStatus::Stopping, ContainerStatus::Restarting]);
+    }
+
+    public function isStartable(): bool
+    {
+        return !in_array($this, [ContainerStatus::Running, ContainerStatus::Starting, ContainerStatus::Stopping, ContainerStatus::Restarting]);
+    }
+
+    public function isRestartable(): bool
+    {
+        if ($this->isStartable()) {
+            return true;
+        }
+
+        return !in_array($this, [ContainerStatus::Offline]);
+    }
+
+    public function isStoppable(): bool
+    {
+        return !in_array($this, [ContainerStatus::Starting, ContainerStatus::Stopping, ContainerStatus::Restarting, ContainerStatus::Exited, ContainerStatus::Offline]);
+    }
+
+    public function isKillable(): bool
+    {
+        // [ContainerStatus::Restarting, ContainerStatus::Removing, ContainerStatus::Dead, ContainerStatus::Created]
+
+        return !in_array($this, [ContainerStatus::Offline, ContainerStatus::Running, ContainerStatus::Exited]);
+    }
 }

app/Enums/EditorLanguages.php

@@ -0,0 +1,141 @@
+<?php
+
+namespace App\Enums;
+
+use Filament\Support\Contracts\HasLabel;
+
+enum EditorLanguages: string implements HasLabel
+{
+    case plaintext = 'plaintext';
+    case abap = 'abap';
+    case apex = 'apex';
+    case azcali = 'azcali';
+    case bat = 'bat';
+    case bicep = 'bicep';
+    case cameligo = 'cameligo';
+    case coljure = 'coljure';
+    case coffeescript = 'coffeescript';
+    case c = 'c';
+    case cpp = 'cpp';
+    case csharp = 'csharp';
+    case csp = 'csp';
+    case css = 'css';
+    case cypher = 'cypher';
+    case dart = 'dart';
+    case dockerfile = 'dockerfile';
+    case ecl = 'ecl';
+    case elixir = 'elixir';
+    case flow9 = 'flow9';
+    case fsharp = 'fsharp';
+    case go = 'go';
+    case graphql = 'graphql';
+    case handlebars = 'handlebars';
+    case hcl = 'hcl';
+    case html = 'html';
+    case ini = 'ini';
+    case java = 'java';
+    case javascript = 'javascript';
+    case julia = 'julia';
+    case json = 'json';
+    case kotlin = 'kotlin';
+    case less = 'less';
+    case lexon = 'lexon';
+    case lua = 'lua';
+    case liquid = 'liquid';
+    case m3 = 'm3';
+    case markdown = 'markdown';
+    case mdx = 'mdx';
+    case mips = 'mips';
+    case msdax = 'msdax';
+    case mysql = 'mysql';
+    case objectivec = 'objective-c';
+    case pascal = 'pascal';
+    case pascaligo = 'pascaligo';
+    case perl = 'perl';
+    case pgsql = 'pgsql';
+    case php = 'php';
+    case pla = 'pla';
+    case postiats = 'postiats';
+    case powerquery = 'powerquery';
+    case powershell = 'powershell';
+    case proto = 'proto';
+    case pug = 'pug';
+    case python = 'python';
+    case qsharp = 'qsharp';
+    case r = 'r';
+    case razor = 'razor';
+    case redis = 'redis';
+    case redshift = 'redshift';
+    case restructuredtext = 'restructuredtext';
+    case ruby = 'ruby';
+    case rust = 'rust';
+    case sb = 'sb';
+    case scala = 'scala';
+    case scheme = 'scheme';
+    case scss = 'scss';
+    case shell = 'shell';
+    case sol = 'sol';
+    case aes = 'aes';
+    case sparql = 'sparql';
+    case sql = 'sql';
+    case st = 'st';
+    case swift = 'swift';
+    case systemverilog = 'systemverilog';
+    case verilog = 'verilog';
+    case tcl = 'tcl';
+    case twig = 'twig';
+    case typescript = 'typescript';
+    case typespec = 'typespec';
+    case vb = 'vb';
+    case wgsl = 'wgsl';
+    case xml = 'xml';
+    case yaml = 'yaml';
+
+    public static function fromWithAlias(string $match): self
+    {
+        return match ($match) {
+            'h' => self::c,
+
+            'cc', 'hpp' => self::cpp,
+
+            'cs' => self::csharp,
+
+            'class' => self::java,
+
+            'htm' => self::html,
+
+            'js', 'mjs', 'cjs' => self::javascript,
+
+            'kt', 'kts' => self::kotlin,
+
+            'md' => self::markdown,
+
+            'm' => self::objectivec,
+
+            'pl', 'pm' => self::perl,
+
+            'php3', 'php4', 'php5', 'phtml' => self::php,
+
+            'py', 'pyc', 'pyo', 'pyi' => self::python,
+
+            'rdata', 'rds' => self::r,
+
+            'rb', 'erb' => self::ruby,
+
+            'sc' => self::scala,
+
+            'sh', 'zsh' => self::shell,
+
+            'ts', 'tsx' => self::typescript,
+
+            'yml' => self::yaml,
+
+            default => self::tryFrom($match) ?? self::plaintext,
+        };
+    }
+
+    public function getLabel(): string
+    {
+        return $this->name;
+    }
+}

app/Enums/RolePermissionModels.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Enums;
+
+enum RolePermissionModels: string
+{
+    case ApiKey = 'apiKey';
+    case DatabaseHost = 'databaseHost';
+    case Database = 'database';
+    case Egg = 'egg';
+    case Mount = 'mount';
+    case Node = 'node';
+    case Role = 'role';
+    case Server = 'server';
+    case User = 'user';
+    case Webhook = 'webhook';
+
+    public function viewAny(): string
+    {
+        return RolePermissionPrefixes::ViewAny->value . ' ' . $this->value;
+    }
+
+    public function view(): string
+    {
+        return RolePermissionPrefixes::View->value . ' ' . $this->value;
+    }
+
+    public function create(): string
+    {
+        return RolePermissionPrefixes::Create->value . ' ' . $this->value;
+    }
+
+    public function update(): string
+    {
+        return RolePermissionPrefixes::Update->value . ' ' . $this->value;
+    }
+}

app/Enums/RolePermissionPrefixes.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Enums;
+
+enum RolePermissionPrefixes: string
+{
+    case ViewAny = 'viewList';
+    case View = 'view';
+    case Create = 'create';
+    case Update = 'update';
+    case Delete = 'delete';
+}

app/Enums/ServerResourceType.php

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

app/Enums/ServerState.php

@@ -2,7 +2,11 @@
 
 namespace App\Enums;
 
-enum ServerState: string
+use Filament\Support\Contracts\HasColor;
+use Filament\Support\Contracts\HasIcon;
+use Filament\Support\Contracts\HasLabel;
+
+enum ServerState: string implements HasColor, HasIcon, HasLabel
 {
     case Normal = 'normal';
     case Installing = 'installing';
@@ -11,7 +15,7 @@ enum ServerState: string
     case Suspended = 'suspended';
     case RestoringBackup = 'restoring_backup';
 
-    public function icon(): string
+    public function getIcon(): string
     {
         return match ($this) {
             self::Normal => 'tabler-heart',
@@ -23,7 +27,7 @@ enum ServerState: string
         };
     }
 
-    public function color(): string
+    public function getColor(): string
     {
         return match ($this) {
             self::Normal => 'primary',
@@ -34,4 +38,9 @@ enum ServerState: string
             self::RestoringBackup => 'primary',
         };
     }
+
+    public function getLabel(): string
+    {
+        return str($this->value)->headline();
+    }
 }

app/Enums/SuspendAction.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Enums;
+
+enum SuspendAction: string
+{
+    case Suspend = 'suspend';
+    case Unsuspend = 'unsuspend';
+}

app/Events/ActivityLogged.php

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

app/Events/Auth/DirectLogin.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Events\Auth;
-
-use App\Models\User;
-use App\Events\Event;
-
-class DirectLogin extends Event
-{
-    public function __construct(public User $user, public bool $remember)
-    {
-    }
-}

app/Events/Auth/FailedCaptcha.php

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

app/Events/Auth/FailedPasswordReset.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Events\Auth;
-
-use App\Events\Event;
-use Illuminate\Queue\SerializesModels;
-
-class FailedPasswordReset extends Event
-{
-    use SerializesModels;
-
-    /**
-     * Create a new event instance.
-     */
-    public function __construct(public string $ip, public string $email)
-    {
-    }
-}

app/Events/Auth/ProvidedAuthenticationToken.php

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

app/Events/Event.php

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

app/Events/Server/Created.php

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

app/Events/Server/Deleted.php

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

app/Events/Server/Deleting.php

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

app/Events/Server/Installed.php

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

app/Events/Server/Saving.php

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

app/Events/Server/SubUserAdded.php

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

app/Events/Server/SubUserRemoved.php

@@ -4,16 +4,15 @@ namespace App\Events\Server;
 
 use App\Events\Event;
 use App\Models\Server;
+use App\Models\User;
 use Illuminate\Queue\SerializesModels;
 
-class Creating extends Event
+class SubUserRemoved extends Event
 {
     use SerializesModels;
 
     /**
      * Create a new event instance.
      */
-    public function __construct(public Server $server)
-    {
-    }
+    public function __construct(public Server $server, public User $user) {}
 }

app/Events/Server/Updated.php

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

app/Events/Server/Updating.php

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

app/Events/Subuser/Created.php

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

app/Events/Subuser/Creating.php

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

app/Events/Subuser/Deleted.php

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

app/Events/Subuser/Deleting.php

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

app/Events/User/Created.php

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

app/Events/User/Creating.php

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

app/Events/User/Deleted.php

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

app/Events/User/Deleting.php

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

app/Exceptions/AccountNotFoundException.php

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

app/Exceptions/AutoDeploymentException.php

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

app/Exceptions/DisplayException.php

@@ -4,18 +4,25 @@ namespace App\Exceptions;
 
 use Exception;
 use Filament\Notifications\Notification;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Psr\Log\LoggerInterface;
 use Illuminate\Http\Response;
 use Illuminate\Container\Container;
-use Prologue\Alerts\AlertsMessageBag;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 
+/**
+ * @deprecated
+ */
 class DisplayException extends PanelException implements HttpExceptionInterface
 {
     public const LEVEL_DEBUG = 'debug';
+
     public const LEVEL_INFO = 'info';
+
     public const LEVEL_WARNING = 'warning';
+
     public const LEVEL_ERROR = 'error';
 
     /**
@@ -36,6 +43,9 @@ class DisplayException extends PanelException implements HttpExceptionInterface
         return Response::HTTP_BAD_REQUEST;
     }
 
+    /**
+     * @return array<string, string>
+     */
     public function getHeaders(): array
     {
         return [];
@@ -46,7 +56,7 @@ class DisplayException extends PanelException implements HttpExceptionInterface
      * and then redirecting them back to the page that they came from. If the
      * request originated from an API hit, return the error in JSONAPI spec format.
      */
-    public function render(Request $request)
+    public function render(Request $request): bool|RedirectResponse|JsonResponse
     {
         if ($request->is('livewire/update')) {
             Notification::make()
@@ -55,15 +65,13 @@ class DisplayException extends PanelException implements HttpExceptionInterface
                 ->danger()
                 ->send();
 
-            return;
+            return false;
         }
 
         if ($request->expectsJson()) {
             return response()->json(Handler::toArray($this), $this->getStatusCode(), $this->getHeaders());
         }
 
-        app(AlertsMessageBag::class)->danger($this->getMessage())->flash();
-
         return redirect()->back()->withInput();
     }
 
@@ -73,10 +81,10 @@ class DisplayException extends PanelException implements HttpExceptionInterface
      *
      * @throws \Throwable
      */
-    public function report()
+    public function report(): void
     {
         if (!$this->getPrevious() instanceof \Exception || !Handler::isReportable($this->getPrevious())) {
-            return null;
+            return;
         }
 
         try {
@@ -85,6 +93,6 @@ class DisplayException extends PanelException implements HttpExceptionInterface
             throw $this->getPrevious();
         }
 
-        return $logger->{$this->getErrorLevel()}($this->getPrevious());
+        $logger->{$this->getErrorLevel()}($this->getPrevious());
     }
 }

app/Exceptions/Handler.php

@@ -20,6 +20,7 @@ use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\Mailer\Exception\TransportException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
+use Throwable;
 
 class Handler extends ExceptionHandler
 {
@@ -45,6 +46,8 @@ class Handler extends ExceptionHandler
     /**
      * Maps exceptions to a specific response code. This handles special exception
      * types that don't have a defined response code.
+     *
+     * @var array<class-string, int>
      */
     protected static array $exceptionResponseCodes = [
         AuthenticationException::class => 401,
@@ -114,7 +117,7 @@ class Handler extends ExceptionHandler
     /**
      * Render an exception into an HTTP response.
      *
-     * @param \Illuminate\Http\Request $request
+     * @param  \Illuminate\Http\Request  $request
      *
      * @throws \Throwable
      */
@@ -140,7 +143,7 @@ class Handler extends ExceptionHandler
      * Transform a validation exception into a consistent format to be returned for
      * calls to the API.
      *
-     * @param \Illuminate\Http\Request $request
+     * @param  \Illuminate\Http\Request  $request
      */
     public function invalidJson($request, ValidationException $exception): JsonResponse
     {
@@ -180,9 +183,16 @@ class Handler extends ExceptionHandler
     }
 
     /**
-     * Return the exception as a JSONAPI representation for use on API requests.
+     * @param  array<string, mixed>  $override
+     * @return array{errors: array{
+     *     code: string,
+     *     status: string,
+     *     detail: string,
+     *     source?: array{line: int, file: string},
+     *     meta?: array{trace: string[], previous: string[]}
+     * }}|array{errors: array{non-empty-array<string, mixed>}}
      */
-    protected function convertExceptionToArray(\Throwable $e, array $override = []): array
+    public static function exceptionToArray(Throwable $e, array $override = []): array
     {
         $match = self::$exceptionResponseCodes[get_class($e)] ?? null;
 
@@ -214,8 +224,8 @@ class Handler extends ExceptionHandler
                     'trace' => Collection::make($e->getTrace())
                         ->map(fn ($trace) => Arr::except($trace, ['args']))
                         ->all(),
-                    'previous' => Collection::make($this->extractPrevious($e))
-                        ->map(fn ($exception) => $e->getTrace())
+                    'previous' => Collection::make(self::extractPrevious($e))
+                        ->map(fn ($exception) => $exception->getTrace())
                         ->map(fn ($trace) => Arr::except($trace, ['args']))
                         ->all(),
                 ],
@@ -225,6 +235,17 @@ class Handler extends ExceptionHandler
         return ['errors' => [array_merge($error, $override)]];
     }
 
+    /**
+     * Return the exception as a JSONAPI representation for use on API requests.
+     *
+     * @param  array{detail?: mixed, source?: mixed, meta?: mixed}  $override
+     * @return array{errors?: array<mixed>}
+     */
+    protected function convertExceptionToArray(Throwable $e, array $override = []): array
+    {
+        return self::exceptionToArray($e, $override);
+    }
+
     /**
      * Return an array of exceptions that should not be reported.
      */
@@ -236,7 +257,7 @@ class Handler extends ExceptionHandler
     /**
      * Convert an authentication exception into an unauthenticated response.
      *
-     * @param \Illuminate\Http\Request $request
+     * @param  \Illuminate\Http\Request  $request
      */
     protected function unauthenticated($request, AuthenticationException $exception): JsonResponse|RedirectResponse
     {
@@ -244,22 +265,19 @@ class Handler extends ExceptionHandler
             return new JsonResponse($this->convertExceptionToArray($exception), JsonResponse::HTTP_UNAUTHORIZED);
         }
 
-        return redirect()->guest('/auth/login');
+        return redirect()->guest(route('filament.app.auth.login'));
     }
 
     /**
      * Extracts all the previous exceptions that lead to the one passed into this
      * function being thrown.
      *
-     * @return \Throwable[]
+     * @return Throwable[]
      */
-    protected function extractPrevious(\Throwable $e): array
+    public static function extractPrevious(Throwable $e): array
     {
         $previous = [];
         while ($value = $e->getPrevious()) {
-            if (!$value instanceof \Throwable) {
-                break;
-            }
             $previous[] = $value;
             $e = $value;
         }
@@ -270,9 +288,11 @@ class Handler extends ExceptionHandler
     /**
      * Helper method to allow reaching into the handler to convert an exception
      * into the expected array response type.
+     *
+     * @return array<mixed>
      */
     public static function toArray(\Throwable $e): array
     {
-        return (new self(app()))->convertExceptionToArray($e);
+        return self::exceptionToArray($e);
     }
 }

app/Exceptions/Http/Base/InvalidPasswordProvidedException.php

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

app/Exceptions/Http/Connection/DaemonConnectionException.php

@@ -1,76 +0,0 @@
-<?php
-
-namespace App\Exceptions\Http\Connection;
-
-use Illuminate\Http\Response;
-use GuzzleHttp\Exception\GuzzleException;
-use App\Exceptions\DisplayException;
-use Illuminate\Support\Facades\Context;
-
-/**
- * @method \GuzzleHttp\Exception\GuzzleException getPrevious()
- */
-class DaemonConnectionException extends DisplayException
-{
-    private int $statusCode = Response::HTTP_GATEWAY_TIMEOUT;
-
-    /**
-     * Every request to the daemon instance will return a unique X-Request-Id header
-     * which allows for all errors to be efficiently tied to a specific request that
-     * triggered them, and gives users a more direct method of informing hosts when
-     * something goes wrong.
-     */
-    private ?string $requestId;
-
-    /**
-     * Throw a displayable exception caused by a daemon connection error.
-     */
-    public function __construct(GuzzleException $previous, bool $useStatusCode = true)
-    {
-        /** @var \GuzzleHttp\Psr7\Response|null $response */
-        $response = method_exists($previous, 'getResponse') ? $previous->getResponse() : null;
-        $this->requestId = $response?->getHeaderLine('X-Request-Id');
-
-        Context::add('request_id', $this->requestId);
-
-        if ($useStatusCode) {
-            $this->statusCode = is_null($response) ? $this->statusCode : $response->getStatusCode();
-            // There are rare conditions where daemon encounters a panic condition and crashes the
-            // request being made after content has already been sent over the wire. In these cases
-            // you can end up with a "successful" response code that is actual an error.
-            //
-            // Handle those better here since we shouldn't ever end up in this exception state and
-            // be returning a 2XX level response.
-            if ($this->statusCode < 400) {
-                $this->statusCode = Response::HTTP_BAD_GATEWAY;
-            }
-        }
-
-        if (is_null($response)) {
-            $message = 'Could not establish a connection to the machine running this server. Please try again.';
-        } else {
-            $message = sprintf('There was an error while communicating with the machine running this server. This error has been logged, please try again. (code: %s) (request_id: %s)', $response->getStatusCode(), $this->requestId ?? '<nil>');
-        }
-
-        // Attempt to pull the actual error message off the response and return that if it is not
-        // a 500 level error.
-        if ($this->statusCode < 500 && !is_null($response)) {
-            $body = json_decode($response->getBody()->__toString(), true);
-            $message = sprintf('An error occurred on the remote host: %s. (request id: %s)', $body['error'] ?? $message, $this->requestId ?? '<nil>');
-        }
-
-        $level = $this->statusCode >= 500 && $this->statusCode !== 504
-            ? DisplayException::LEVEL_ERROR
-            : DisplayException::LEVEL_WARNING;
-
-        parent::__construct($message, $previous, $level);
-    }
-
-    /**
-     * Return the HTTP status code for this exception.
-     */
-    public function getStatusCode(): int
-    {
-        return $this->statusCode;
-    }
-}

app/Exceptions/Http/HttpForbiddenException.php

@@ -10,7 +10,7 @@ class HttpForbiddenException extends HttpException
     /**
      * HttpForbiddenException constructor.
      */
-    public function __construct(string $message = null, \Throwable $previous = null)
+    public function __construct(?string $message = null, ?\Throwable $previous = null)
     {
         parent::__construct(Response::HTTP_FORBIDDEN, $message, $previous);
     }

app/Exceptions/Http/Server/FileTypeNotEditableException.php

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

app/Exceptions/Http/Server/ServerStateConflictException.php

@@ -12,7 +12,7 @@ class ServerStateConflictException extends ConflictHttpException
      * Exception thrown when the server is in an unsupported state for API access or
      * certain operations within the codebase.
      */
-    public function __construct(Server $server, \Throwable $previous = null)
+    public function __construct(Server $server, ?\Throwable $previous = null)
     {
         $message = 'This server is currently in an unsupported state, please try again later.';
         if ($server->isSuspended()) {

app/Exceptions/Http/TwoFactorAuthRequiredException.php

@@ -11,7 +11,7 @@ class TwoFactorAuthRequiredException extends HttpException implements HttpExcept
     /**
      * TwoFactorAuthRequiredException constructor.
      */
-    public function __construct(\Throwable $previous = null)
+    public function __construct(?\Throwable $previous = null)
     {
         parent::__construct(Response::HTTP_BAD_REQUEST, 'Two-factor authentication is required on this account in order to access this endpoint.', $previous);
     }

app/Exceptions/Model/DataValidationException.php

@@ -42,6 +42,9 @@ class DataValidationException extends PanelException implements HttpExceptionInt
         return 500;
     }
 
+    /**
+     * @return array<string, string>
+     */
     public function getHeaders(): array
     {
         return [];

app/Exceptions/PanelException.php

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

app/Exceptions/Repository/Daemon/InvalidPowerSignalException.php

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

app/Exceptions/Repository/DuplicateDatabaseNameException.php

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