BallStudios/pterodactyl_addon
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: defensive ServiceProvider (class_exists guards), fixed install.sh apply_patch logic

Browse Source
This commit is contained in:
BaileyCodes
2026-06-11 21:05:57 -05:00
parent 338dc52f76
commit d413bca7e9
3 changed files with 103 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
app/Addons/AdvancedAdmin/AddonServiceProvider.php
View File

@@ -16,13 +16,6 @@ namespace Pterodactyl\Addons\AdvancedAdmin;
use Illuminate\Support\ServiceProvider;
use Illuminate\Console\Scheduling\Schedule;
use Pterodactyl\Addons\AdvancedAdmin\Jobs\Network\CollectNetworkMetricsJob;
use Pterodactyl\Addons\AdvancedAdmin\Jobs\Network\DownsampleNetworkMetricsJob;
use Pterodactyl\Addons\AdvancedAdmin\Jobs\Network\PruneNetworkMetricsJob;
use Pterodactyl\Addons\AdvancedAdmin\Jobs\Revisions\PruneFileRevisionsJob;
use Pterodactyl\Addons\AdvancedAdmin\Jobs\Console\ExpireStalePlayersJob;
use Pterodactyl\Addons\AdvancedAdmin\Listeners\Console\ConsoleOutputListener;
use Pterodactyl\Addons\AdvancedAdmin\Services\Roles\PermissionResolver;
class AddonServiceProvider extends ServiceProvider
{
@@ -38,7 +31,10 @@ class AddonServiceProvider extends ServiceProvider
);
// Bind the PermissionResolver as a singleton for performance
$this->app->singleton(PermissionResolver::class);
$resolver = 'Pterodactyl\Addons\AdvancedAdmin\Services\Roles\PermissionResolver';
if (class_exists($resolver)) {
$this->app->singleton($resolver);
}
}
/**
@@ -47,40 +43,61 @@ class AddonServiceProvider extends ServiceProvider
public function boot(): void
{
// ── Routes ────────────────────────────────────────────────────────────
$this->loadRoutesFrom(__DIR__ . '/../../routes/addon-client.php');
$this->loadRoutesFrom(__DIR__ . '/../../routes/addon-application.php');
$clientRoutes = __DIR__ . '/../../routes/addon-client.php';
$appRoutes = __DIR__ . '/../../routes/addon-application.php';
if (file_exists($clientRoutes)) {
$this->loadRoutesFrom($clientRoutes);
}
if (file_exists($appRoutes)) {
$this->loadRoutesFrom($appRoutes);
}
// ── Migrations ────────────────────────────────────────────────────────
$this->loadMigrationsFrom(__DIR__ . '/../../database/migrations/addon');
$migrationsPath = __DIR__ . '/../../database/migrations/addon';
if (is_dir($migrationsPath)) {
$this->loadMigrationsFrom($migrationsPath);
}
// ── Scheduled Jobs ────────────────────────────────────────────────────
$this->callAfterResolving(Schedule::class, function (Schedule $schedule) {
if (config('advanced-admin.network.enabled')) {
$schedule->job(CollectNetworkMetricsJob::class)
// Network metric collection
$collectJob = 'Pterodactyl\Addons\AdvancedAdmin\Jobs\Network\CollectNetworkMetricsJob';
$downsampleJob = 'Pterodactyl\Addons\AdvancedAdmin\Jobs\Network\DownsampleNetworkMetricsJob';
$pruneNetJob = 'Pterodactyl\Addons\AdvancedAdmin\Jobs\Network\PruneNetworkMetricsJob';
$pruneRevJob = 'Pterodactyl\Addons\AdvancedAdmin\Jobs\Revisions\PruneFileRevisionsJob';
$expireJob = 'Pterodactyl\Addons\AdvancedAdmin\Jobs\Console\ExpireStalePlayersJob';
if (config('advanced-admin.network.enabled') && class_exists($collectJob)) {
$schedule->job(new $collectJob())
->everyTenSeconds()
->withoutOverlapping(5)
->onOneServer();
$schedule->job(DownsampleNetworkMetricsJob::class)
->hourly()
->withoutOverlapping(30)
->onOneServer();
if (class_exists($downsampleJob)) {
$schedule->job(new $downsampleJob())
->hourly()
->withoutOverlapping(30)
->onOneServer();
}
$schedule->job(PruneNetworkMetricsJob::class)
if (class_exists($pruneNetJob)) {
$schedule->job(new $pruneNetJob())
->daily()
->withoutOverlapping(60)
->onOneServer();
}
}
if (config('advanced-admin.revisions.enabled') && class_exists($pruneRevJob)) {
$schedule->job(new $pruneRevJob())
->daily()
->withoutOverlapping(60)
->onOneServer();
}
if (config('advanced-admin.revisions.enabled')) {
$schedule->job(PruneFileRevisionsJob::class)
->daily()
->withoutOverlapping(60)
->onOneServer();
}
if (config('advanced-admin.console.enabled')) {
$schedule->job(ExpireStalePlayersJob::class)
if (config('advanced-admin.console.enabled') && class_exists($expireJob)) {
$schedule->job(new $expireJob())
->everyFiveMinutes()
->withoutOverlapping(4);
}
@@ -88,23 +105,26 @@ class AddonServiceProvider extends ServiceProvider
// ── Event Listeners ───────────────────────────────────────────────────
// Console output listener (parses join/leave for player cache)
// Hooked to Pterodactyl's existing console output events if they exist.
// Falls back gracefully if event is not fired by this panel version.
if (class_exists(\Pterodactyl\Events\Server\ConsoleDataReceived::class)) {
$this->app['events']->listen(
\Pterodactyl\Events\Server\ConsoleDataReceived::class,
ConsoleOutputListener::class
);
$consoleEvent = 'Pterodactyl\Events\Server\ConsoleDataReceived';
$consoleListener = 'Pterodactyl\Addons\AdvancedAdmin\Listeners\Console\ConsoleOutputListener';
if (class_exists($consoleEvent) && class_exists($consoleListener)) {
$this->app['events']->listen($consoleEvent, $consoleListener);
}
// ── Artisan Commands ──────────────────────────────────────────────────
if ($this->app->runningInConsole()) {
$this->commands([
Console\Commands\AddonPatchCommand::class,
Console\Commands\AddonInstallCommand::class,
Console\Commands\AddonUninstallCommand::class,
Console\Commands\CollectNetworkCommand::class,
]);
$commands = [];
$candidates = [
'Pterodactyl\Addons\AdvancedAdmin\Console\Commands\CollectNetworkCommand',
];
foreach ($candidates as $cmd) {
if (class_exists($cmd)) {
$commands[] = $cmd;
}
}
if (!empty($commands)) {
$this->commands($commands);
}
}
// ── Publishable Assets ────────────────────────────────────────────────