You've already forked Atomcms-edit
Remove all auto-update functionality (commands, services, widgets, blades, translations)
This commit is contained in:
root
@@ -4,7 +4,6 @@ declare(strict_types=1);
|
||||
|
||||
namespace App\Actions\Commandocentrum;
|
||||
|
||||
use App\Services\EmulatorUpdateService;
|
||||
use App\Services\RconService;
|
||||
use App\Services\SettingsService;
|
||||
use Illuminate\Support\Facades\Process;
|
||||
@@ -13,7 +12,6 @@ class EmulatorControlAction
|
||||
{
|
||||
public function __construct(
|
||||
private readonly SettingsService $settings,
|
||||
private readonly EmulatorUpdateService $updateService,
|
||||
) {}
|
||||
|
||||
public function start(): array
|
||||
@@ -59,29 +57,4 @@ class EmulatorControlAction
|
||||
|
||||
return ['success' => true, 'message' => 'Alert verstuurd naar alle gebruikers!'];
|
||||
}
|
||||
|
||||
public function build(): array
|
||||
{
|
||||
return $this->updateService->buildFromSource();
|
||||
}
|
||||
|
||||
public function update(): array
|
||||
{
|
||||
return $this->updateService->updateEmulator();
|
||||
}
|
||||
|
||||
public function runSqlUpdates(): array
|
||||
{
|
||||
return $this->updateService->runSqlUpdates();
|
||||
}
|
||||
|
||||
public function getBackups(): array
|
||||
{
|
||||
return $this->updateService->getBackupList();
|
||||
}
|
||||
|
||||
public function restoreBackup(string $backupName): array
|
||||
{
|
||||
return $this->updateService->restoreBackup($backupName);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,119 +0,0 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Actions\Commandocentrum;
|
||||
|
||||
use App\Services\SettingsService;
|
||||
use Illuminate\Support\Facades\Artisan;
|
||||
use Illuminate\Support\Facades\Process;
|
||||
|
||||
class NitroControlAction
|
||||
{
|
||||
public function __construct(
|
||||
private readonly SettingsService $settings,
|
||||
) {}
|
||||
|
||||
public function pullUpdates(string $clientPath, string $rendererPath, string $branch): array
|
||||
{
|
||||
$this->runGitPull($clientPath, $branch);
|
||||
$this->runGitPull($rendererPath, $branch);
|
||||
|
||||
return ['success' => true, 'message' => 'Nitro bijgewerkt van GitHub'];
|
||||
}
|
||||
|
||||
public function build(string $clientPath, string $rendererPath, string $branch): array
|
||||
{
|
||||
$this->runGitPull($clientPath, $branch);
|
||||
$this->runGitPull($rendererPath, $branch);
|
||||
|
||||
Process::timeout(120)->run('cd ' . escapeshellarg($clientPath) . ' && sudo -u www-data npm install 2>&1');
|
||||
Process::timeout(120)->run('cd ' . escapeshellarg($rendererPath) . ' && sudo -u www-data npm install 2>&1');
|
||||
|
||||
$exitCode = Artisan::call('build:theme');
|
||||
|
||||
return [
|
||||
'success' => $exitCode === 0,
|
||||
'message' => $exitCode === 0 ? 'Nitro build succesvol!' : 'Build gestart - controleer handmatig',
|
||||
];
|
||||
}
|
||||
|
||||
public function generateConfigs(string $siteUrl, string $webroot, string $gamedataPath): array
|
||||
{
|
||||
if (! filter_var($siteUrl, FILTER_VALIDATE_URL)) {
|
||||
return ['success' => false, 'message' => 'Voer een geldige URL in'];
|
||||
}
|
||||
|
||||
$existingConfigs = $this->readExistingConfigs($webroot, $gamedataPath);
|
||||
|
||||
$exitCode = Artisan::call('app:generate-nitro-configs', ['--site-url' => $siteUrl]);
|
||||
|
||||
if ($existingConfigs !== [] && $exitCode === 0) {
|
||||
$this->mergeExistingConfigs($webroot, $existingConfigs);
|
||||
}
|
||||
|
||||
$this->settings->set('nitro_last_checked', now()->toIso8601String());
|
||||
|
||||
return [
|
||||
'success' => $exitCode === 0,
|
||||
'message' => $exitCode === 0 ? 'Configs gegenereerd & bestaande instellingen behouden!' : 'Config gegenereerd (controleer handmatig)',
|
||||
];
|
||||
}
|
||||
|
||||
private function runGitPull(string $path, string $branch): void
|
||||
{
|
||||
Process::timeout(60)->run('cd ' . escapeshellarg($path) . ' && sudo -u www-data git pull origin ' . escapeshellarg($branch) . ' 2>&1');
|
||||
}
|
||||
|
||||
private function readExistingConfigs(string $webroot, string $gamedataPath): array
|
||||
{
|
||||
$configs = [];
|
||||
$files = ['renderer-config.json', 'ui-config.json', 'UITexts.json'];
|
||||
|
||||
foreach ($files as $file) {
|
||||
$path = $webroot . '/' . $file;
|
||||
$content = @file_get_contents($path);
|
||||
if ($content) {
|
||||
$decoded = json_decode($content, true);
|
||||
if (json_last_error() === JSON_ERROR_NONE) {
|
||||
$configs[$file] = $decoded;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ($gamedataPath !== '') {
|
||||
$gamedataConfigs = [
|
||||
'ExternalTexts.json' => $gamedataPath . '/config/ExternalTexts.json',
|
||||
'FurnitureData.json' => $gamedataPath . '/config/FurnitureData.json',
|
||||
'ProductData.json' => $gamedataPath . '/config/ProductData.json',
|
||||
'FigureData.json' => $gamedataPath . '/config/FigureData.json',
|
||||
];
|
||||
|
||||
foreach ($gamedataConfigs as $key => $path) {
|
||||
$content = @file_get_contents($path);
|
||||
if ($content) {
|
||||
$decoded = json_decode($content, true);
|
||||
if (json_last_error() === JSON_ERROR_NONE) {
|
||||
$configs['gamedata.' . $key] = $decoded;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $configs;
|
||||
}
|
||||
|
||||
private function mergeExistingConfigs(string $webroot, array $existingConfigs): void
|
||||
{
|
||||
if (isset($existingConfigs['renderer-config.json'])) {
|
||||
$newPath = $webroot . '/renderer-config.json';
|
||||
$newContent = @file_get_contents($newPath);
|
||||
$newConfig = json_decode($newContent, true);
|
||||
|
||||
if ($newConfig && json_last_error() === JSON_ERROR_NONE) {
|
||||
$merged = array_merge($existingConfigs['renderer-config.json'], $newConfig);
|
||||
@file_put_contents($newPath, json_encode($merged, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,150 +0,0 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Console\Commands;
|
||||
|
||||
use App\Enums\AlertChannel;
|
||||
use App\Enums\AlertType;
|
||||
use App\Services\AlertService;
|
||||
use App\Services\EmulatorUpdateService;
|
||||
use Illuminate\Console\Command;
|
||||
use Illuminate\Support\Facades\Cache;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
|
||||
class AutoUpdateCommand extends Command
|
||||
{
|
||||
#[\Override]
|
||||
protected $signature = 'update:auto
|
||||
{--force : Forceer update ook al is het niet de geplande tijd}
|
||||
{--sql-only : Alleen SQL updates draaien}
|
||||
{--emu-only : Alleen emulator updates draaien}';
|
||||
|
||||
#[\Override]
|
||||
protected $description = 'Automatische emulator en SQL updates uitvoeren';
|
||||
|
||||
private const string CACHE_KEY_LAST_EMU_UPDATE = 'auto_update_last_emu';
|
||||
|
||||
private const string CACHE_KEY_LAST_SQL_UPDATE = 'auto_update_last_sql';
|
||||
|
||||
public function handle(AlertService $alertService, EmulatorUpdateService $updateService): int
|
||||
{
|
||||
$this->info('Automatische update check...');
|
||||
|
||||
$isForced = $this->option('force');
|
||||
$sqlOnly = $this->option('sql-only');
|
||||
$emuOnly = $this->option('emu-only');
|
||||
|
||||
if (! $isForced && ! $this->isScheduledTime()) {
|
||||
$this->line('Niet de geplande tijd, overslaan.');
|
||||
|
||||
return Command::SUCCESS;
|
||||
}
|
||||
|
||||
if (! $sqlOnly) {
|
||||
$this->runEmulatorUpdate($alertService, $updateService);
|
||||
}
|
||||
|
||||
if (! $emuOnly) {
|
||||
$this->runSqlUpdates($alertService, $updateService);
|
||||
}
|
||||
|
||||
return Command::SUCCESS;
|
||||
}
|
||||
|
||||
private function isScheduledTime(): bool
|
||||
{
|
||||
$enabled = setting('auto_update_enabled', true);
|
||||
|
||||
if (! $enabled) {
|
||||
return true;
|
||||
}
|
||||
|
||||
$scheduleTime = setting('auto_update_schedule', '03:00');
|
||||
$scheduleDays = setting('auto_update_days', '0,1,2,3,4,5,6');
|
||||
|
||||
$now = now();
|
||||
$currentTime = $now->format('H:i');
|
||||
$currentDay = (int) $now->dayOfWeek;
|
||||
|
||||
$allowedDays = array_map(intval(...), explode(',', $scheduleDays));
|
||||
|
||||
if (! in_array($currentDay, $allowedDays)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if ($currentTime !== $scheduleTime) {
|
||||
$minuteDiff = abs(strtotime($currentTime) - strtotime((string) $scheduleTime)) / 60;
|
||||
if ($minuteDiff > 5) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private function runEmulatorUpdate(AlertService $alertService, EmulatorUpdateService $updateService): void
|
||||
{
|
||||
$check = $updateService->checkForUpdates();
|
||||
|
||||
if (! ($check['update_available'] ?? false)) {
|
||||
$this->line('Emulator is al up-to-date.');
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
$this->warn('Nieuwe emulator versie beschikbaar: ' . ($check['latest_version'] ?? 'onbekend'));
|
||||
$this->info('Emulator updaten...');
|
||||
|
||||
$result = $updateService->updateEmulator();
|
||||
|
||||
if ($result['success']) {
|
||||
$this->info('Emulator succesvol geüpdatet!');
|
||||
$alertService->sendEmulatorUpdate($result['version'] ?? 'onbekend', $result['message'] ?? '');
|
||||
Log::info('[AutoUpdate] Emulator updated to v' . ($result['version'] ?? 'unknown'));
|
||||
} else {
|
||||
$this->error('Emulator update mislukt: ' . ($result['error'] ?? 'onbekende fout'));
|
||||
$alertService->send(
|
||||
AlertType::EMULATOR_ERROR,
|
||||
'Emulator Auto-Update Mislukt: ' . ($result['error'] ?? 'Onbekende fout'),
|
||||
[],
|
||||
AlertChannel::DISCORD,
|
||||
);
|
||||
}
|
||||
|
||||
Cache::put(self::CACHE_KEY_LAST_EMU_UPDATE, now()->toIso8601String());
|
||||
}
|
||||
|
||||
private function runSqlUpdates(AlertService $alertService, EmulatorUpdateService $updateService): void
|
||||
{
|
||||
$check = $updateService->checkForSqlUpdates();
|
||||
|
||||
if (! ($check['has_updates'] ?? false)) {
|
||||
$this->line('Geen SQL updates beschikbaar.');
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
$this->warn($check['message']);
|
||||
$this->info('SQL updates uitvoeren...');
|
||||
|
||||
$result = $updateService->runSqlUpdates();
|
||||
|
||||
if ($result['success'] && ! empty($result['files_run'])) {
|
||||
$count = count($result['files_run']);
|
||||
$this->info("{$count} SQL updates succesvol uitgevoerd!");
|
||||
$alertService->sendSqlUpdate($count, $result['message'] ?? '');
|
||||
Log::info('[AutoUpdate] SQL updates completed', ['files' => $result['files_run']]);
|
||||
} elseif (! empty($result['errors'])) {
|
||||
$this->warn('SQL updates met fouten: ' . implode(', ', $result['errors']));
|
||||
$alertService->send(
|
||||
AlertType::CRITICAL_ERROR,
|
||||
'SQL Updates Met Fouten: ' . implode(', ', $result['errors']),
|
||||
['files' => $result['errors']],
|
||||
AlertChannel::DISCORD,
|
||||
);
|
||||
}
|
||||
|
||||
Cache::put(self::CACHE_KEY_LAST_SQL_UPDATE, now()->toIso8601String());
|
||||
}
|
||||
}
|
||||
@@ -1,172 +0,0 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Console\Commands;
|
||||
|
||||
use App\Enums\AlertChannel;
|
||||
use App\Enums\AlertType;
|
||||
use App\Services\AlertService;
|
||||
use App\Services\EmulatorUpdateService;
|
||||
use Illuminate\Console\Command;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
|
||||
class EmulatorUpdateCommand extends Command
|
||||
{
|
||||
#[\Override]
|
||||
protected $signature = 'emulator:update
|
||||
{--check : Alleen controleren op updates}
|
||||
{--force : Forceer update ook al is er geen nieuwe versie}
|
||||
{--repair : Probeer emulator te repareren}
|
||||
{--rebuild : Forceer build vanaf source}';
|
||||
|
||||
#[\Override]
|
||||
protected $description = 'Update de emulator vanaf GitHub';
|
||||
|
||||
public function handle(EmulatorUpdateService $updateService, AlertService $alertService): int
|
||||
{
|
||||
if ($this->option('repair')) {
|
||||
return $this->repairEmulator($updateService, $alertService);
|
||||
}
|
||||
|
||||
if (! $updateService->isConfigured()) {
|
||||
$this->error('Geen GitHub URL geconfigureerd voor emulator updates.');
|
||||
$this->info('Configureer dit in Filament > Settings > Emulator');
|
||||
|
||||
return Command::FAILURE;
|
||||
}
|
||||
|
||||
$this->info('Emulator update service gestart...');
|
||||
|
||||
$checkResult = $updateService->checkForUpdates();
|
||||
|
||||
if (isset($checkResult['error'])) {
|
||||
$this->error($checkResult['error']);
|
||||
|
||||
return Command::FAILURE;
|
||||
}
|
||||
|
||||
$this->table(
|
||||
['Property', 'Value'],
|
||||
[
|
||||
['Huidige Versie', $checkResult['current_version']],
|
||||
['Nieuwste Versie', $checkResult['latest_version']],
|
||||
['Update Beschikbaar', $checkResult['update_available'] ? 'JA' : 'NEE'],
|
||||
['Type', $checkResult['update_type'] ?? 'N/A'],
|
||||
],
|
||||
);
|
||||
|
||||
if ($this->option('check')) {
|
||||
return Command::SUCCESS;
|
||||
}
|
||||
|
||||
$force = $this->option('force');
|
||||
$rebuild = $this->option('rebuild');
|
||||
|
||||
if (! $checkResult['update_available'] && ! $force && ! $rebuild) {
|
||||
$this->info('Emulator is al up-to-date!');
|
||||
|
||||
return Command::SUCCESS;
|
||||
}
|
||||
|
||||
if (! $checkResult['update_available'] && ($force || $rebuild)) {
|
||||
$this->warn('Geen nieuwe versie beschikbaar, maar force/rebuild aangevraagd.');
|
||||
}
|
||||
|
||||
if (! $force && ! $rebuild && ! $this->confirm('Wil je de emulator updaten naar v' . $checkResult['latest_version'] . '?')) {
|
||||
$this->info('Update geannuleerd.');
|
||||
|
||||
return Command::SUCCESS;
|
||||
}
|
||||
|
||||
$this->info('Emulator wordt geüpdatet...');
|
||||
|
||||
try {
|
||||
if ($rebuild || $checkResult['type'] === 'source_build') {
|
||||
$this->info('Build vanaf source...');
|
||||
$result = $updateService->buildFromSource($force);
|
||||
} else {
|
||||
$result = $updateService->updateEmulator();
|
||||
}
|
||||
|
||||
if ($result['success']) {
|
||||
$this->info($result['message'] ?? 'Emulator succesvol geüpdatet!');
|
||||
$alertService->send(
|
||||
AlertType::EMULATOR_ONLINE,
|
||||
'Emulator succesvol geüpdatet naar v' . ($result['version'] ?? 'onbekend'),
|
||||
[
|
||||
'version' => $result['version'] ?? 'onbekend',
|
||||
'jar' => $result['jar'] ?? 'N/A',
|
||||
],
|
||||
AlertChannel::DISCORD,
|
||||
);
|
||||
Log::info('[EmulatorUpdateCommand] Update successful', $result);
|
||||
|
||||
return Command::SUCCESS;
|
||||
}
|
||||
|
||||
$this->error('Update mislukt: ' . ($result['error'] ?? 'Onbekende fout'));
|
||||
$alertService->send(
|
||||
AlertType::EMULATOR_ERROR,
|
||||
'Emulator update mislukt: ' . ($result['error'] ?? 'Onbekende fout'),
|
||||
[],
|
||||
AlertChannel::DISCORD,
|
||||
);
|
||||
Log::error('[EmulatorUpdateCommand] Update failed', $result);
|
||||
|
||||
return Command::FAILURE;
|
||||
|
||||
} catch (\Exception $e) {
|
||||
$this->error('Update exception: ' . $e->getMessage());
|
||||
$alertService->send(
|
||||
AlertType::CRITICAL_ERROR,
|
||||
'Emulator update exception: ' . $e->getMessage(),
|
||||
[],
|
||||
AlertChannel::DISCORD,
|
||||
);
|
||||
Log::error('[EmulatorUpdateCommand] Exception', ['error' => $e->getMessage()]);
|
||||
|
||||
return Command::FAILURE;
|
||||
}
|
||||
}
|
||||
|
||||
private function repairEmulator(EmulatorUpdateService $updateService, AlertService $alertService): int
|
||||
{
|
||||
$this->warn('🔧 Emulator repair modus gestart...');
|
||||
$this->info('Dit zal de emulator status controleren en proberen te repareren.');
|
||||
|
||||
try {
|
||||
$repairResult = $updateService->repairEmulator();
|
||||
|
||||
if ($repairResult['success']) {
|
||||
$this->info('✅ Repair succesvol!');
|
||||
foreach ($repairResult['actions'] ?? [] as $action) {
|
||||
$this->line(' - ' . $action);
|
||||
}
|
||||
$alertService->send(
|
||||
AlertType::EMULATOR_ONLINE,
|
||||
'Emulator gerepareerd',
|
||||
['actions' => $repairResult['actions'] ?? []],
|
||||
AlertChannel::DISCORD,
|
||||
);
|
||||
|
||||
return Command::SUCCESS;
|
||||
}
|
||||
|
||||
$this->error('❌ Repair mislukt: ' . ($repairResult['error'] ?? 'Onbekende fout'));
|
||||
$alertService->send(
|
||||
AlertType::EMULATOR_ERROR,
|
||||
'Emulator repair mislukt: ' . ($repairResult['error'] ?? 'Onbekende fout'),
|
||||
[],
|
||||
AlertChannel::DISCORD,
|
||||
);
|
||||
|
||||
return Command::FAILURE;
|
||||
|
||||
} catch (\Exception $e) {
|
||||
$this->error('❌ Repair exception: ' . $e->getMessage());
|
||||
|
||||
return Command::FAILURE;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,796 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Console\Commands;
|
||||
|
||||
use App\Services\NitroUpdateService;
|
||||
use Illuminate\Console\Command;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Illuminate\Support\Facades\Process;
|
||||
|
||||
class GenerateNitroConfigs extends Command
|
||||
{
|
||||
#[\Override]
|
||||
protected $signature = 'app:generate-nitro-configs
|
||||
{--site-url= : The site URL to use}';
|
||||
|
||||
#[\Override]
|
||||
protected $description = 'Generate Nitro configuration files (renderer-config.json, ui-config.json, UITexts.json)';
|
||||
|
||||
private array $checks = [];
|
||||
|
||||
public function handle(): int
|
||||
{
|
||||
$siteUrl = $this->option('site-url') ?? setting('nitro_site_url', config('app.url', 'https://epicnabbo.nl'));
|
||||
|
||||
$this->info('🔧 Nitro Config Generator');
|
||||
$this->line('═══════════════════════════════════════════════');
|
||||
|
||||
// Check 1: Validate URL
|
||||
$this->addCheck(function () use ($siteUrl) {
|
||||
if (empty($siteUrl) || ! filter_var($siteUrl, FILTER_VALIDATE_URL)) {
|
||||
throw new \Exception("Invalid URL: {$siteUrl}");
|
||||
}
|
||||
$this->line(" ✓ URL: {$siteUrl}");
|
||||
});
|
||||
|
||||
$nitroService = new NitroUpdateService;
|
||||
$status = $nitroService->getStatus();
|
||||
$webroot = $status['webroot'] ?? '/var/www/Client';
|
||||
$buildPath = $status['build_path'] ?? '/var/www/atomcms/nitro-client/dist';
|
||||
|
||||
// Check 2: Webroot exists
|
||||
$this->addCheck(function () use ($webroot) {
|
||||
$result = Process::timeout(5)->run('test -d ' . escapeshellarg((string) $webroot));
|
||||
if ($result->exitCode() !== 0) {
|
||||
throw new \Exception("Webroot does not exist: {$webroot}");
|
||||
}
|
||||
$this->line(" ✓ Webroot exists: {$webroot}");
|
||||
});
|
||||
|
||||
// Check 3: Webroot is writable
|
||||
$this->addCheck(function () use ($webroot) {
|
||||
$result = Process::timeout(5)->run('test -w ' . escapeshellarg((string) $webroot));
|
||||
if ($result->exitCode() !== 0) {
|
||||
throw new \Exception("Webroot is not writable: {$webroot}");
|
||||
}
|
||||
$this->line(' ✓ Webroot is writable');
|
||||
});
|
||||
|
||||
// Check 4: Build path exists
|
||||
$this->addCheck(function () use ($buildPath) {
|
||||
$result = Process::timeout(5)->run('test -d ' . escapeshellarg((string) $buildPath));
|
||||
if ($result->exitCode() !== 0) {
|
||||
throw new \Exception("Build path does not exist: {$buildPath}");
|
||||
}
|
||||
$this->line(" ✓ Build path exists: {$buildPath}");
|
||||
});
|
||||
|
||||
// Check both buildPath and webroot for example files
|
||||
$this->addCheck(function () use ($buildPath, $webroot) {
|
||||
// Map .example to .json fallback
|
||||
$fileMap = [
|
||||
'renderer-config.example' => 'renderer-config.json',
|
||||
'ui-config.example' => 'ui-config.json',
|
||||
'UITexts.example' => 'UITexts.example',
|
||||
];
|
||||
|
||||
$allFound = true;
|
||||
|
||||
foreach ($fileMap as $exampleFile => $jsonFile) {
|
||||
// Check .example file first
|
||||
$buildPathResult = Process::timeout(5)->run('test -f ' . escapeshellarg($buildPath . '/' . $exampleFile));
|
||||
$webrootResult = Process::timeout(5)->run('test -f ' . escapeshellarg($webroot . '/' . $exampleFile));
|
||||
|
||||
if ($buildPathResult->exitCode() === 0) {
|
||||
$this->line(" ✓ Found in build path: {$exampleFile}");
|
||||
} elseif ($webrootResult->exitCode() === 0) {
|
||||
$this->line(" ✓ Found in webroot: {$exampleFile}");
|
||||
} elseif ($jsonFile !== $exampleFile) {
|
||||
// Check json fallback for .example files
|
||||
$jsonBuildResult = Process::timeout(5)->run('test -f ' . escapeshellarg($buildPath . '/' . $jsonFile));
|
||||
$jsonWebrootResult = Process::timeout(5)->run('test -f ' . escapeshellarg($webroot . '/' . $jsonFile));
|
||||
if ($jsonBuildResult->exitCode() === 0) {
|
||||
$this->line(" ✓ Found in build path: {$jsonFile}");
|
||||
} elseif ($jsonWebrootResult->exitCode() === 0) {
|
||||
$this->line(" ✓ Found in webroot: {$jsonFile}");
|
||||
} else {
|
||||
$this->warn(" ⚠ Missing: {$exampleFile} or {$jsonFile}");
|
||||
$allFound = false;
|
||||
}
|
||||
} else {
|
||||
$this->warn(" ⚠ Missing: {$exampleFile}");
|
||||
$allFound = false;
|
||||
}
|
||||
}
|
||||
|
||||
if (! $allFound) {
|
||||
throw new \Exception('Some example files are missing');
|
||||
}
|
||||
});
|
||||
|
||||
// Check 6: Check disk space
|
||||
$this->addCheck(function () use ($webroot) {
|
||||
$result = Process::timeout(10)->run("df -h {$webroot} | tail -1 | awk '{print $4}'");
|
||||
if ($result->successful()) {
|
||||
$free = trim($result->output());
|
||||
$this->line(" ✓ Free space: {$free}");
|
||||
}
|
||||
});
|
||||
|
||||
// Check 7: Validate bundled/config gamedata files
|
||||
$this->addCheck(function () {
|
||||
$bundledConfigDir = '/var/www/Gamedata/bundled/config';
|
||||
$configDir = '/var/www/Gamedata/config';
|
||||
$requiredFiles = ['HabboAvatarActions.json', 'FurnitureData.json', 'ExternalTexts.json', 'ProductData.json', 'FigureData.json', 'FigureMap.json', 'EffectMap.json'];
|
||||
|
||||
// Create bundled/config if it doesn't exist
|
||||
if (! is_dir($bundledConfigDir)) {
|
||||
mkdir($bundledConfigDir, 0755, true);
|
||||
$this->line(" 📁 Created directory: {$bundledConfigDir}");
|
||||
}
|
||||
|
||||
// Copy missing files from config to bundled/config
|
||||
foreach ($requiredFiles as $file) {
|
||||
$targetPath = $bundledConfigDir . '/' . $file;
|
||||
if (! file_exists($targetPath)) {
|
||||
$sourcePath = $configDir . '/' . $file;
|
||||
if (file_exists($sourcePath)) {
|
||||
copy($sourcePath, $targetPath);
|
||||
$this->line(" 📋 Copied: {$file} to bundled/config");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$this->line(' ✓ Gamedata bundled/config files ready');
|
||||
});
|
||||
|
||||
// Check 8: Validate existing config files
|
||||
$this->addCheck(function () use ($webroot) {
|
||||
$configFiles = ['renderer-config.json', 'ui-config.json', 'UITexts.json'];
|
||||
foreach ($configFiles as $file) {
|
||||
$path = $webroot . '/' . $file;
|
||||
$result = Process::timeout(5)->run('test -f ' . escapeshellarg($path));
|
||||
if ($result->exitCode() === 0) {
|
||||
// Validate JSON
|
||||
$jsonCheck = Process::timeout(5)->run('python3 -c "import json; json.load(open(\'' . $path . '\'))" 2>&1 || echo "INVALID"');
|
||||
if (str_contains($jsonCheck->output(), 'INVALID')) {
|
||||
$this->warn(" ⚠ Invalid JSON: {$file}");
|
||||
} else {
|
||||
$this->line(" ✓ Valid JSON: {$file}");
|
||||
}
|
||||
} else {
|
||||
$this->line(" - New file: {$file}");
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// Run all checks
|
||||
$this->line('');
|
||||
$this->info('Running pre-flight checks...');
|
||||
$this->line('───────────────────────────────────────────────');
|
||||
|
||||
try {
|
||||
foreach ($this->checks as $check) {
|
||||
$check();
|
||||
}
|
||||
$this->line('───────────────────────────────────────────────');
|
||||
$this->info('✅ All checks passed!');
|
||||
} catch (\Exception $e) {
|
||||
$this->error('❌ Check failed: ' . $e->getMessage());
|
||||
$this->newLine();
|
||||
$this->error('Please fix the issue before generating configs.');
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
// Generate configs
|
||||
$this->newLine();
|
||||
$this->info('Generating configuration files...');
|
||||
$this->line('───────────────────────────────────────────────');
|
||||
|
||||
$protocol = str_starts_with((string) $siteUrl, 'https') ? 'https' : 'http';
|
||||
$host = preg_replace('/^https?:\/\//', '', (string) $siteUrl);
|
||||
|
||||
try {
|
||||
// Step 0: Sync latest example files from GitHub
|
||||
$this->syncExampleFromGithub($buildPath, $webroot);
|
||||
|
||||
$rendererConfig = $this->generateRendererConfig($protocol, $host, $buildPath, $webroot);
|
||||
$uiConfig = $this->generateUiConfig($protocol, $host, $buildPath, $webroot);
|
||||
|
||||
// Compare with existing deployed configs
|
||||
$this->compareConfigs($rendererConfig, 'renderer-config', $webroot);
|
||||
$this->compareConfigs($uiConfig, 'ui-config', $webroot);
|
||||
|
||||
// Validate generated JSON
|
||||
$this->validateJson($rendererConfig, 'renderer-config');
|
||||
$this->validateJson($uiConfig, 'ui-config');
|
||||
|
||||
$tempFile = '/tmp/nitro_config_' . uniqid();
|
||||
file_put_contents($tempFile . '_renderer', json_encode($rendererConfig, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
|
||||
file_put_contents($tempFile . '_ui', json_encode($uiConfig, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
|
||||
|
||||
// Copy generated configs
|
||||
$commands = [
|
||||
'cp "' . $tempFile . '_renderer" "' . $webroot . '/renderer-config.json"',
|
||||
'cp "' . $tempFile . '_ui" "' . $webroot . '/ui-config.json"',
|
||||
];
|
||||
|
||||
// Copy UITexts.json if it exists (check both buildPath and webroot)
|
||||
$uitextsInBuild = Process::timeout(5)->run('test -f "' . $buildPath . '/UITexts.example"')->exitCode() === 0;
|
||||
$uitextsInWebroot = Process::timeout(5)->run('test -f "' . $webroot . '/UITexts.example"')->exitCode() === 0;
|
||||
if ($uitextsInBuild) {
|
||||
$commands[] = 'cp "' . $buildPath . '/UITexts.example" "' . $webroot . '/UITexts.json"';
|
||||
$this->line(' ✓ Generated: UITexts.json (from build path)');
|
||||
} elseif ($uitextsInWebroot) {
|
||||
$commands[] = 'cp "' . $webroot . '/UITexts.example" "' . $webroot . '/UITexts.json"';
|
||||
$this->line(' ✓ Generated: UITexts.json (from webroot)');
|
||||
}
|
||||
|
||||
$commands[] = 'rm "' . $tempFile . '_renderer" "' . $tempFile . '_ui"';
|
||||
|
||||
Process::timeout(10)->run(implode(' && ', $commands));
|
||||
|
||||
// Set proper ownership
|
||||
Process::timeout(10)->run("chown www-data:www-data {$webroot}/renderer-config.json {$webroot}/ui-config.json {$webroot}/UITexts.json 2>/dev/null");
|
||||
|
||||
setting('nitro_config_generated_at', now()->toIso8601String());
|
||||
|
||||
$this->line(' ✓ Generated: renderer-config.json');
|
||||
$this->line(' ✓ Generated: ui-config.json');
|
||||
|
||||
// Verify generated files
|
||||
$this->verifyGeneratedFiles($webroot);
|
||||
|
||||
$this->line('───────────────────────────────────────────────');
|
||||
$this->info('✅ Configs generated successfully!');
|
||||
|
||||
Log::info('[NitroConfig] Generated successfully', [
|
||||
'webroot' => $webroot,
|
||||
'host' => $host,
|
||||
]);
|
||||
|
||||
return 0;
|
||||
} catch (\Exception $e) {
|
||||
$this->error('❌ Generation failed: ' . $e->getMessage());
|
||||
Log::error('[NitroConfig] Generation failed', ['error' => $e->getMessage()]);
|
||||
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
private function addCheck(callable $check): void
|
||||
{
|
||||
$this->checks[] = function () use ($check) {
|
||||
$check();
|
||||
};
|
||||
}
|
||||
|
||||
private function validateJson(array $data, string $name): void
|
||||
{
|
||||
$encoded = json_encode($data, JSON_THROW_ON_ERROR);
|
||||
$decoded = json_decode($encoded, true);
|
||||
|
||||
if ($decoded === null && json_last_error() !== JSON_ERROR_NONE) {
|
||||
throw new \Exception("Invalid JSON generated for {$name}");
|
||||
}
|
||||
|
||||
$this->line(" ✓ Validated: {$name}");
|
||||
}
|
||||
|
||||
private function verifyGeneratedFiles(string $webroot): void
|
||||
{
|
||||
$files = ['renderer-config.json', 'ui-config.json', 'UITexts.json'];
|
||||
$allValid = true;
|
||||
|
||||
foreach ($files as $file) {
|
||||
$path = $webroot . '/' . $file;
|
||||
$result = Process::timeout(5)->run('test -f ' . escapeshellarg($path));
|
||||
|
||||
if ($result->exitCode() === 0) {
|
||||
$size = Process::timeout(5)->run('stat -c%s ' . escapeshellarg($path));
|
||||
$sizeStr = trim($size->output()) . ' bytes';
|
||||
$this->line(" ✓ Verified: {$file} ({$sizeStr})");
|
||||
} else {
|
||||
$this->warn(" ⚠ Missing: {$file}");
|
||||
$allValid = false;
|
||||
}
|
||||
}
|
||||
|
||||
if (! $allValid) {
|
||||
throw new \Exception('Some files were not generated');
|
||||
}
|
||||
}
|
||||
|
||||
private function generateRendererConfig(string $protocol, string $host, string $buildPath, string $webroot): array
|
||||
{
|
||||
$httpProtocol = $protocol === 'https' ? 'https' : 'http';
|
||||
$wssProtocol = $protocol === 'https' ? 'wss' : 'ws';
|
||||
$wsHost = 'ws.' . $host;
|
||||
|
||||
$rendererConfig = [];
|
||||
|
||||
// Check build path first, then webroot for .example file
|
||||
$examplePath = $buildPath . '/renderer-config.example';
|
||||
if (Process::timeout(5)->run('test -f ' . escapeshellarg($examplePath))->exitCode() !== 0) {
|
||||
$examplePath = $webroot . '/renderer-config.example';
|
||||
}
|
||||
|
||||
// Fallback to .json version (newer Nitro-V3 format)
|
||||
if (Process::timeout(5)->run('test -f ' . escapeshellarg($examplePath))->exitCode() !== 0) {
|
||||
$jsonPath = $buildPath . '/renderer-config.json';
|
||||
if (Process::timeout(5)->run('test -f ' . escapeshellarg($jsonPath))->exitCode() === 0) {
|
||||
$examplePath = $jsonPath;
|
||||
} else {
|
||||
$jsonPath = $webroot . '/renderer-config.json';
|
||||
if (Process::timeout(5)->run('test -f ' . escapeshellarg($jsonPath))->exitCode() === 0) {
|
||||
$examplePath = $jsonPath;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Load COMPLETE example file as base
|
||||
if (Process::timeout(5)->run('test -f ' . escapeshellarg($examplePath))->exitCode() === 0) {
|
||||
$content = file_get_contents($examplePath);
|
||||
// Fix invalid escape sequences (literal \n, \r, \t in JSON values)
|
||||
$content = $this->fixInvalidJsonEscapeSequences($content);
|
||||
$rendererConfig = @json_decode($content, true) ?: [];
|
||||
$this->line(' ✓ Loaded renderer config from: ' . basename($examplePath) . ' (' . count($rendererConfig) . ' keys)');
|
||||
} else {
|
||||
$this->warn(' ⚠ renderer-config.example/json not found');
|
||||
|
||||
return [];
|
||||
}
|
||||
|
||||
// Recursively replace ALL URLs in the entire config
|
||||
$rendererConfig = $this->replaceUrlsRecursively($rendererConfig, $httpProtocol, $wssProtocol, $host, $wsHost);
|
||||
|
||||
// Auto-detect asset directory names on disk and fix paths
|
||||
$rendererConfig = $this->autoDetectAssetPaths($rendererConfig, $webroot);
|
||||
|
||||
// Special handling for socket.url - use ws subdomain
|
||||
if (isset($rendererConfig['socket.url'])) {
|
||||
$rendererConfig['socket.url'] = $wssProtocol . '://ws.' . $host;
|
||||
}
|
||||
|
||||
// Auto-detect local asset paths from Gamedata directory
|
||||
$gamedataBase = $httpProtocol . '://' . $host;
|
||||
|
||||
// Check what directories exist in Gamedata and set URLs accordingly
|
||||
$gamedataPath = '/var/www/Gamedata';
|
||||
if (is_dir($gamedataPath)) {
|
||||
// Check for bundled directory - serve via /gamedata/bundled (nginx alias)
|
||||
if (is_dir($gamedataPath . '/bundled')) {
|
||||
$rendererConfig['asset.url'] = $gamedataBase . '/gamedata/bundled';
|
||||
}
|
||||
// JSON config files are in /gamedata/config/
|
||||
if (is_dir($gamedataPath . '/config')) {
|
||||
$rendererConfig['gamedata.url'] = $gamedataBase . '/gamedata/config';
|
||||
}
|
||||
// Check for c_images directory - serve via /gamedata/c_images
|
||||
if (is_dir($gamedataPath . '/c_images')) {
|
||||
$rendererConfig['image.library.url'] = $gamedataBase . '/gamedata/c_images/';
|
||||
// Use icons folder for furni icons
|
||||
if (is_dir($gamedataPath . '/icons')) {
|
||||
$rendererConfig['hof.furni.url'] = $gamedataBase . '/gamedata/icons';
|
||||
} else {
|
||||
$rendererConfig['hof.furni.url'] = $gamedataBase . '/gamedata/c_images/dcr/hof_furni';
|
||||
}
|
||||
}
|
||||
// Fix furni icon path - icons are directly in hof.furni folder, not in icons subfolder
|
||||
if (isset($rendererConfig['furni.asset.icon.url'])) {
|
||||
$rendererConfig['furni.asset.icon.url'] = '${hof.furni.url}/%libname%%param%_icon.png';
|
||||
}
|
||||
// Fix sound machine samples path - sounds are in /gamedata/sounds/
|
||||
if (isset($rendererConfig['external.samples.url'])) {
|
||||
$rendererConfig['external.samples.url'] = $gamedataBase . '/gamedata/sounds/sound_machine_sample_%sample%.mp3';
|
||||
}
|
||||
// Check for images directory
|
||||
if (is_dir($gamedataPath . '/images')) {
|
||||
$rendererConfig['images.url'] = $gamedataBase . '/gamedata/images';
|
||||
}
|
||||
}
|
||||
|
||||
// Add missing keys that might not be in the example
|
||||
if (! isset($rendererConfig['external.plugins'])) {
|
||||
$rendererConfig['external.plugins'] = [];
|
||||
}
|
||||
|
||||
// Add YouTube API key from settings
|
||||
$youtubeApiKey = setting('youtube_api_key', '');
|
||||
if (! empty($youtubeApiKey)) {
|
||||
$rendererConfig['youtube.api.key'] = $youtubeApiKey;
|
||||
$this->line(' ✓ Added YouTube API key to renderer config');
|
||||
}
|
||||
|
||||
// Ensure pet.types matches the exact required list in order
|
||||
if (isset($rendererConfig['pet.types'])) {
|
||||
$requiredPetTypes = [
|
||||
'dog',
|
||||
'cat',
|
||||
'croco',
|
||||
'terrier',
|
||||
'bear',
|
||||
'pig',
|
||||
'lion',
|
||||
'rhino',
|
||||
'spider',
|
||||
'turtle',
|
||||
'chicken',
|
||||
'frog',
|
||||
'dragon',
|
||||
'monster',
|
||||
'monkey',
|
||||
'horse',
|
||||
'monsterplant',
|
||||
'bunnyeaster',
|
||||
'bunnyevil',
|
||||
'bunnydepressed',
|
||||
'bunnylove',
|
||||
'pigeongood',
|
||||
'pigeonevil',
|
||||
'demonmonkey',
|
||||
'bearbaby',
|
||||
'terrierbaby',
|
||||
'gnome',
|
||||
'leprechaun',
|
||||
'kittenbaby',
|
||||
'puppybaby',
|
||||
'pigletbaby',
|
||||
'haloompa',
|
||||
'fools',
|
||||
'pterosaur',
|
||||
'velociraptor',
|
||||
'cow',
|
||||
'dragondog',
|
||||
'pkmshaymin2',
|
||||
'LeetEendjes',
|
||||
'pkmnentei',
|
||||
'squirtle',
|
||||
'LeetBH',
|
||||
'LeetCaviaaa',
|
||||
'LeetFantj',
|
||||
'LeetHotelMario',
|
||||
'LeetUil',
|
||||
'LeetWolf',
|
||||
'pokemon_mewblu',
|
||||
'LeetBB',
|
||||
'LeetHotelMari1',
|
||||
'LeetMewtw',
|
||||
'LeetPikachu',
|
||||
'LeetYos',
|
||||
'LeetE',
|
||||
'LeetMewt1',
|
||||
'LeetPen',
|
||||
'slendermn',
|
||||
'pkmnPAPI0',
|
||||
'pkmnPAPI1',
|
||||
'pkmnPAPI2',
|
||||
'pkmnPAPI3',
|
||||
'pkmnPAPI4',
|
||||
'pokmn_mew',
|
||||
'pkmashhhpet',
|
||||
'pkmbeautfly',
|
||||
'pkmcelebipe',
|
||||
'pkmdarkraip',
|
||||
'pkmeeveepet',
|
||||
'pkmjirachip',
|
||||
'pkmpichupet',
|
||||
'pkmriolupet',
|
||||
'pkmshayminp',
|
||||
'pkmtogepipe',
|
||||
'pkmvictinip',
|
||||
'slenderm1',
|
||||
'LeetEendj16',
|
||||
'pkmnente1',
|
||||
'LeetBa',
|
||||
'babymeisje',
|
||||
'babyBH',
|
||||
'bb_hbx',
|
||||
'LeetUi1',
|
||||
];
|
||||
|
||||
$rendererConfig['pet.types'] = $requiredPetTypes;
|
||||
$this->line(' ✓ Set pet.types to exact required list');
|
||||
}
|
||||
|
||||
return $rendererConfig;
|
||||
}
|
||||
|
||||
private function generateUiConfig(string $protocol, string $host, string $buildPath, string $webroot): array
|
||||
{
|
||||
$httpProtocol = $protocol === 'https' ? 'https' : 'http';
|
||||
$wssProtocol = $protocol === 'https' ? 'wss' : 'ws';
|
||||
$wsHost = 'ws.' . $host;
|
||||
|
||||
$uiConfig = [];
|
||||
|
||||
// Check build path first, then webroot for .example file
|
||||
$examplePath = $buildPath . '/ui-config.example';
|
||||
if (Process::timeout(5)->run('test -f ' . escapeshellarg($examplePath))->exitCode() !== 0) {
|
||||
$examplePath = $webroot . '/ui-config.example';
|
||||
}
|
||||
|
||||
// Fallback to .json version (newer Nitro-V3 format)
|
||||
if (Process::timeout(5)->run('test -f ' . escapeshellarg($examplePath))->exitCode() !== 0) {
|
||||
$jsonPath = $buildPath . '/ui-config.json';
|
||||
if (Process::timeout(5)->run('test -f ' . escapeshellarg($jsonPath))->exitCode() === 0) {
|
||||
$examplePath = $jsonPath;
|
||||
} else {
|
||||
$jsonPath = $webroot . '/ui-config.json';
|
||||
if (Process::timeout(5)->run('test -f ' . escapeshellarg($jsonPath))->exitCode() === 0) {
|
||||
$examplePath = $jsonPath;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Load COMPLETE example file as base
|
||||
if (Process::timeout(5)->run('test -f ' . escapeshellarg($examplePath))->exitCode() === 0) {
|
||||
$content = file_get_contents($examplePath);
|
||||
// Fix invalid escape sequences
|
||||
$content = $this->fixInvalidJsonEscapeSequences($content);
|
||||
$uiConfig = @json_decode($content, true) ?: [];
|
||||
$this->line(' ✓ Loaded ui config from: ' . basename($examplePath) . ' (' . count($uiConfig) . ' keys)');
|
||||
} else {
|
||||
$this->warn(' ⚠ ui-config.example/json not found');
|
||||
|
||||
return [];
|
||||
}
|
||||
|
||||
// Recursively replace ALL URLs in the entire config
|
||||
$uiConfig = $this->replaceUrlsRecursively($uiConfig, $httpProtocol, $wssProtocol, $host, $wsHost);
|
||||
|
||||
return $uiConfig;
|
||||
}
|
||||
|
||||
private function fixInvalidJsonEscapeSequences(string $content): string
|
||||
{
|
||||
// The example file has literal backslash + any letter in JSON values
|
||||
// which breaks JSON. We need to escape all of these.
|
||||
|
||||
$backslash = chr(92);
|
||||
$letters = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'];
|
||||
|
||||
foreach ($letters as $letter) {
|
||||
$content = str_replace($backslash . $letter, $backslash . $backslash . $letter, $content);
|
||||
}
|
||||
|
||||
return $content;
|
||||
}
|
||||
|
||||
private function replaceUrlsRecursively(array $config, string $httpProtocol, string $wsProtocol, string $host, string $wsHost): array
|
||||
{
|
||||
foreach ($config as &$value) {
|
||||
if (is_array($value)) {
|
||||
// Handle nested arrays (like navigator.room.models)
|
||||
if ($this->isAssociativeArray($value)) {
|
||||
$value = $this->replaceUrlsRecursively($value, $httpProtocol, $wsProtocol, $host, $wsHost);
|
||||
} else {
|
||||
// Handle arrays of URLs
|
||||
$value = array_map(function ($item) use ($httpProtocol, $wsProtocol, $host, $wsHost) {
|
||||
if (is_string($item)) {
|
||||
return $this->replaceUrl($item, $httpProtocol, $wsProtocol, $host, $wsHost);
|
||||
}
|
||||
|
||||
return $item;
|
||||
}, $value);
|
||||
}
|
||||
} elseif (is_string($value)) {
|
||||
$value = $this->replaceUrl($value, $httpProtocol, $wsProtocol, $host, $wsHost);
|
||||
}
|
||||
}
|
||||
|
||||
return $config;
|
||||
}
|
||||
|
||||
private function replaceUrl(string $url, string $httpProtocol, string $wsProtocol, string $host, string $wsHost): string
|
||||
{
|
||||
// Replace ws/wss URLs with ws subdomain
|
||||
if (str_starts_with($url, 'ws://') || str_starts_with($url, 'wss://')) {
|
||||
$path = parse_url($url, PHP_URL_PATH) ?? '/';
|
||||
|
||||
return $wsProtocol . '://' . $wsHost . ($path !== '/' ? $path : '');
|
||||
}
|
||||
|
||||
// Replace localhost in all URLs
|
||||
$url = preg_replace('#https?://localhost(?::\d+)?#', $httpProtocol . '://' . $host, $url);
|
||||
$url = preg_replace('#wss?://localhost(?::\d+)?#', $wsProtocol . '://' . $wsHost, (string) $url);
|
||||
$url = preg_replace('#localhost(?::\d+)?#', $host, (string) $url);
|
||||
|
||||
// Fix broken escape sequences in URL paths (from invalid JSON in example files)
|
||||
// Pattern: /public\nitro-assets\gamedata or any variation
|
||||
$url = preg_replace('#/public\\n[a-z_-]+\\\\gamedata#i', '/gamedata', (string) $url);
|
||||
$url = preg_replace('#/public\\\\[a-z_-]+\\\\gamedata#i', '/gamedata', (string) $url);
|
||||
$url = preg_replace('#/nitro-assets\\\\gamedata#i', '/gamedata', (string) $url);
|
||||
$url = preg_replace('#/nitro\\\\[a-z_-]+#i', '/gamedata', (string) $url);
|
||||
|
||||
// Fix known asset path patterns
|
||||
$url = str_replace('/public/nitro-assets/gamedata', '/gamedata', $url);
|
||||
$url = str_replace('/swf/gamedata', '/gamedata', $url);
|
||||
|
||||
// Clean up any remaining backslashes in URLs
|
||||
$url = str_replace('\\', '/', $url);
|
||||
|
||||
// Clean up any remaining double slashes (but keep protocol slashes)
|
||||
$url = preg_replace('#([^:])//+#', '$1/', $url);
|
||||
|
||||
return $url;
|
||||
}
|
||||
|
||||
private function isAssociativeArray(array $arr): bool
|
||||
{
|
||||
if ($arr === []) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return array_keys($arr) !== range(0, count($arr) - 1);
|
||||
}
|
||||
|
||||
private function autoDetectAssetPaths(array $config, string $webroot): array
|
||||
{
|
||||
// Check multiple possible gamedata locations
|
||||
$possiblePaths = [
|
||||
$webroot . '/gamedata',
|
||||
'/var/www/Gamedata',
|
||||
'/var/www/gamedata',
|
||||
];
|
||||
$gamedataPath = array_find($possiblePaths, fn ($path) => is_dir($path));
|
||||
|
||||
if (! $gamedataPath) {
|
||||
return $config;
|
||||
}
|
||||
|
||||
$assetDir = opendir($gamedataPath);
|
||||
$actualDirs = [];
|
||||
while (($entry = readdir($assetDir)) !== false) {
|
||||
if ($entry !== '.' && $entry !== '..' && is_dir($gamedataPath . '/' . $entry)) {
|
||||
$actualDirs[strtolower($entry)] = $entry;
|
||||
}
|
||||
}
|
||||
closedir($assetDir);
|
||||
|
||||
$pathChecks = [
|
||||
'pet.asset.url' => 'pets',
|
||||
'furni.asset.url' => 'furniture',
|
||||
'avatar.asset.url' => 'clothes',
|
||||
'avatar.asset.effect.url' => 'effect',
|
||||
'generic.asset.url' => 'generic_custom',
|
||||
];
|
||||
|
||||
foreach ($config as $key => &$value) {
|
||||
if (! is_string($value) || ! isset($pathChecks[$key])) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$expectedDir = $pathChecks[$key];
|
||||
$lowerExpected = strtolower($expectedDir);
|
||||
$actualName = null;
|
||||
|
||||
// Special case: "figure" is often used instead of "clothes" for avatars
|
||||
if ($lowerExpected === 'clothes' && isset($actualDirs['figure'])) {
|
||||
$actualName = $actualDirs['figure'];
|
||||
} elseif (isset($actualDirs[$lowerExpected])) {
|
||||
$actualName = $actualDirs[$lowerExpected];
|
||||
} else {
|
||||
foreach ($actualDirs as $actualLower => $actual) {
|
||||
if (str_starts_with($actualLower, rtrim($lowerExpected, 's')) ||
|
||||
str_starts_with(rtrim($actualLower, 's'), rtrim($lowerExpected, 's'))) {
|
||||
$actualName = $actual;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ($actualName && $actualName !== $expectedDir) {
|
||||
$value = str_replace("/{$expectedDir}/", "/{$actualName}/", $value);
|
||||
$this->line(" 🔍 Auto-detected: {$key} -> /{$actualName}/ (was /{$expectedDir}/)");
|
||||
}
|
||||
}
|
||||
|
||||
return $config;
|
||||
}
|
||||
|
||||
private function syncExampleFromGithub(string $buildPath, string $webroot): void
|
||||
{
|
||||
$this->info('Syncing latest examples from GitHub...');
|
||||
|
||||
$rendererRepo = setting('nitro_github_url', '');
|
||||
$repo = $this->parseRepoFromUrl($rendererRepo);
|
||||
if (! $repo) {
|
||||
$this->warn(' ⚠ No GitHub repo configured, skipping sync');
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
$branch = setting('nitro_github_branch', 'main');
|
||||
|
||||
$examples = [
|
||||
'renderer-config.example' => 'renderer-config.example',
|
||||
'ui-config.example' => 'ui-config.example',
|
||||
'UITexts.example' => 'UITexts.json',
|
||||
];
|
||||
|
||||
foreach (array_keys($examples) as $remoteFile) {
|
||||
$tempFile = '/tmp/' . $remoteFile . '_' . uniqid();
|
||||
$fetched = false;
|
||||
|
||||
// Try multiple paths: root, public/, nitro-client/dist/, Nitro-V3 paths
|
||||
$paths = ['', 'public/', 'nitro-client/dist/', 'dist/', 'src/', 'assets/'];
|
||||
foreach ($paths as $path) {
|
||||
$url = "https://raw.githubusercontent.com/{$repo}/{$branch}/{$path}{$remoteFile}";
|
||||
$result = Process::timeout(15)->run("curl -sL -o {$tempFile} '{$url}'");
|
||||
|
||||
if ($result->successful() && file_exists($tempFile) && filesize($tempFile) > 10) {
|
||||
$content = file_get_contents($tempFile);
|
||||
$data = @json_decode($content, true);
|
||||
|
||||
if (is_array($data) && $data !== []) {
|
||||
// Save to both buildPath and webroot
|
||||
file_put_contents($buildPath . '/' . $remoteFile, $content);
|
||||
file_put_contents($webroot . '/' . $remoteFile, $content);
|
||||
$this->line(" ✓ Synced: {$remoteFile} (" . count($data) . " keys from {$path}{$remoteFile})");
|
||||
$fetched = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@unlink($tempFile);
|
||||
}
|
||||
|
||||
if (! $fetched) {
|
||||
$this->line(" - Skipped: {$remoteFile} (not found in any path)");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function parseRepoFromUrl(string $url): ?string
|
||||
{
|
||||
if (preg_match('/github\.com\/([^\/]+\/[^\/\?#]+)/', $url, $matches)) {
|
||||
return rtrim($matches[1], '/');
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private function compareConfigs(array $generated, string $name, string $webroot): void
|
||||
{
|
||||
$currentPath = $webroot . '/' . $name . '.json';
|
||||
if (! file_exists($currentPath)) {
|
||||
$this->line(" ℹ {$name}: Geen bestaande config — nieuwe generatie");
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
$current = @json_decode(file_get_contents($currentPath), true);
|
||||
if (! is_array($current)) {
|
||||
$this->warn(" ⚠ {$name}: Bestaande config is ongeldig JSON");
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
$newKeys = array_diff(array_keys($generated), array_keys($current));
|
||||
$removedKeys = array_diff(array_keys($current), array_keys($generated));
|
||||
$changedKeys = [];
|
||||
|
||||
foreach (array_intersect(array_keys($generated), array_keys($current)) as $key) {
|
||||
if ($generated[$key] !== $current[$key]) {
|
||||
$changedKeys[] = $key;
|
||||
}
|
||||
}
|
||||
|
||||
if ($newKeys !== []) {
|
||||
$this->line(" 🆕 {$name}: " . count($newKeys) . ' nieuwe key(s): ' . implode(', ', array_slice($newKeys, 0, 10)));
|
||||
if (count($newKeys) > 10) {
|
||||
$this->line(' ... en ' . (count($newKeys) - 10) . ' meer');
|
||||
}
|
||||
}
|
||||
if ($removedKeys !== []) {
|
||||
$this->line(" 🗑 {$name}: " . count($removedKeys) . ' verwijderde key(s): ' . implode(', ', array_slice($removedKeys, 0, 5)));
|
||||
}
|
||||
if ($changedKeys !== []) {
|
||||
$this->line(" 🔄 {$name}: " . count($changedKeys) . ' gewijzigde key(s): ' . implode(', ', array_slice($changedKeys, 0, 5)));
|
||||
}
|
||||
if ($newKeys === [] && $removedKeys === [] && $changedKeys === []) {
|
||||
$this->line(" ✓ {$name}: Geen wijzigingen");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,272 +0,0 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Console\Commands;
|
||||
|
||||
use App\Enums\AlertChannel;
|
||||
use App\Enums\AlertType;
|
||||
use App\Services\AlertService;
|
||||
use App\Services\NitroUpdateService;
|
||||
use Illuminate\Console\Command;
|
||||
use Illuminate\Support\Facades\Cache;
|
||||
|
||||
class NitroUpdateCommand extends Command
|
||||
{
|
||||
#[\Override]
|
||||
protected $signature = 'nitro:auto
|
||||
{--force : Forceer update ook al is het niet de geplande tijd}
|
||||
{--build-only : Alleen build en deploy uitvoeren}
|
||||
{--full : Volledige reset en reinstall}
|
||||
{--repair : Probeer Nitro te repareren}
|
||||
{--diagnose : Toon diagnose informatie}';
|
||||
|
||||
#[\Override]
|
||||
protected $description = 'Automatische Nitro client en renderer updates';
|
||||
|
||||
private const string CACHE_KEY_LAST_UPDATE = 'nitro_last_update';
|
||||
|
||||
public function handle(AlertService $alertService, NitroUpdateService $nitroService): int
|
||||
{
|
||||
$this->info('Nitro update check...');
|
||||
|
||||
if ($this->option('diagnose')) {
|
||||
return $this->diagnose($nitroService);
|
||||
}
|
||||
|
||||
if ($this->option('repair')) {
|
||||
return $this->repair($alertService, $nitroService);
|
||||
}
|
||||
|
||||
$isForced = $this->option('force');
|
||||
$buildOnly = $this->option('build-only');
|
||||
$full = $this->option('full');
|
||||
|
||||
if ($buildOnly) {
|
||||
return $this->buildOnly($alertService, $nitroService);
|
||||
}
|
||||
|
||||
if (! $isForced && ! $this->isScheduledTime()) {
|
||||
$this->line('Niet de geplande tijd, overslaan.');
|
||||
|
||||
return Command::SUCCESS;
|
||||
}
|
||||
|
||||
$repo = setting('nitro_github_url', 'duckietm/Nitro-V3 (default)');
|
||||
$this->info("GitHub: {$repo}");
|
||||
|
||||
if ($full) {
|
||||
return $this->fullReinstall($alertService, $nitroService);
|
||||
}
|
||||
|
||||
$status = $nitroService->getStatus();
|
||||
|
||||
$this->info('Client: ' . ($status['client_installed'] ? '✅' : '❌'));
|
||||
$this->info('Renderer: ' . ($status['renderer_installed'] ? '✅' : '❌'));
|
||||
$this->info('Build: ' . ($status['build_exists'] ? '✅' : '❌'));
|
||||
$this->info('Deployed: ' . ($status['deployed'] ? '✅' : '❌'));
|
||||
|
||||
if (! $status['client_installed'] || ! $status['renderer_installed']) {
|
||||
$this->warn('Nitro niet volledig geïnstalleerd. Voer --full uit voor volledige installatie.');
|
||||
if ($this->confirm('Wil je nu volledig installeren?')) {
|
||||
return $this->fullReinstall($alertService, $nitroService);
|
||||
}
|
||||
|
||||
return Command::SUCCESS;
|
||||
}
|
||||
|
||||
$this->line('✅ Nitro client is up-to-date.');
|
||||
|
||||
if ($isForced) {
|
||||
$this->warn('Force update aangevraagd...');
|
||||
|
||||
return $this->fullReinstall($alertService, $nitroService);
|
||||
}
|
||||
|
||||
Cache::put(self::CACHE_KEY_LAST_UPDATE, now()->toIso8601String());
|
||||
|
||||
return Command::SUCCESS;
|
||||
}
|
||||
|
||||
private function diagnose(NitroUpdateService $nitroService): int
|
||||
{
|
||||
$this->info('🔍 Nitro diagnose...');
|
||||
$diagnosis = $nitroService->diagnose();
|
||||
|
||||
$this->newLine();
|
||||
$this->info('=== Controle Resultaten ===');
|
||||
|
||||
$checks = $diagnosis['checks'] ?? [];
|
||||
foreach ($checks as $key => $value) {
|
||||
if (is_bool($value)) {
|
||||
$this->line(($value ? '✅' : '❌') . ' ' . $key);
|
||||
} elseif (is_array($value)) {
|
||||
$this->line($key . ': ' . count($value) . ' items');
|
||||
} else {
|
||||
$this->line($key . ': ' . $value);
|
||||
}
|
||||
}
|
||||
|
||||
if (! empty($diagnosis['issues'])) {
|
||||
$this->newLine();
|
||||
$this->error('=== Problemen ===');
|
||||
foreach ($diagnosis['issues'] as $issue) {
|
||||
$this->line('❌ ' . $issue);
|
||||
}
|
||||
}
|
||||
|
||||
if (! empty($diagnosis['recommendations'])) {
|
||||
$this->newLine();
|
||||
$this->info('=== Aanbevelingen ===');
|
||||
foreach ($diagnosis['recommendations'] as $rec) {
|
||||
$this->line('💡 ' . $rec);
|
||||
}
|
||||
}
|
||||
|
||||
return Command::SUCCESS;
|
||||
}
|
||||
|
||||
private function repair(AlertService $alertService, NitroUpdateService $nitroService): int
|
||||
{
|
||||
$this->warn('🔧 Nitro repair modus gestart...');
|
||||
$this->info('Dit zal de Nitro installatie controleren en repareren.');
|
||||
|
||||
try {
|
||||
$repairResult = $nitroService->repair();
|
||||
|
||||
if ($repairResult['success']) {
|
||||
$this->info('✅ Repair succesvol!');
|
||||
foreach ($repairResult['actions'] ?? [] as $action) {
|
||||
$this->line(' - ' . $action);
|
||||
}
|
||||
$alertService->send(
|
||||
AlertType::EMULATOR_UPDATE,
|
||||
'Nitro client gerepareerd',
|
||||
['actions' => $repairResult['actions'] ?? []],
|
||||
AlertChannel::DISCORD,
|
||||
);
|
||||
|
||||
return Command::SUCCESS;
|
||||
}
|
||||
|
||||
$this->error('❌ Repair mislukt: ' . ($repairResult['error'] ?? 'Onbekende fout'));
|
||||
if (! empty($repairResult['actions'])) {
|
||||
$this->line('Uitgevoerde acties:');
|
||||
foreach ($repairResult['actions'] as $action) {
|
||||
$this->line(' - ' . $action);
|
||||
}
|
||||
}
|
||||
if (! empty($repairResult['errors'])) {
|
||||
$this->line('Fouten:');
|
||||
foreach ($repairResult['errors'] as $error) {
|
||||
$this->line(' ❌ ' . $error);
|
||||
}
|
||||
}
|
||||
$alertService->send(
|
||||
AlertType::EMULATOR_ERROR,
|
||||
'Nitro repair mislukt: ' . ($repairResult['error'] ?? 'Onbekende fout'),
|
||||
[],
|
||||
AlertChannel::DISCORD,
|
||||
);
|
||||
|
||||
return Command::FAILURE;
|
||||
|
||||
} catch (\Exception $e) {
|
||||
$this->error('❌ Repair exception: ' . $e->getMessage());
|
||||
|
||||
return Command::FAILURE;
|
||||
}
|
||||
}
|
||||
|
||||
private function buildOnly(AlertService $alertService, NitroUpdateService $nitroService): int
|
||||
{
|
||||
$this->info('Build en deploy uitvoeren...');
|
||||
|
||||
$buildResult = $nitroService->buildClient();
|
||||
|
||||
if (! $buildResult['success']) {
|
||||
$this->error('Build mislukt: ' . ($buildResult['error'] ?? 'Onbekend'));
|
||||
|
||||
return Command::FAILURE;
|
||||
}
|
||||
|
||||
$nitroService->deployClient();
|
||||
$nitroService->generateConfigs();
|
||||
|
||||
$this->info('Client succesvol gedeployed!');
|
||||
$alertService->send(
|
||||
AlertType::EMULATOR_UPDATE,
|
||||
'Nitro client opnieuw gedeployed',
|
||||
[],
|
||||
AlertChannel::DISCORD,
|
||||
);
|
||||
|
||||
return Command::SUCCESS;
|
||||
}
|
||||
|
||||
private function fullReinstall(AlertService $alertService, NitroUpdateService $nitroService): int
|
||||
{
|
||||
$this->warn('Volledige reinstall wordt uitgevoerd...');
|
||||
|
||||
try {
|
||||
$result = $nitroService->updateNitro();
|
||||
|
||||
if ($result['success']) {
|
||||
$this->info('Nitro succesvol opnieuw geïnstalleerd!');
|
||||
$alertService->send(
|
||||
AlertType::EMULATOR_UPDATE,
|
||||
'Nitro client succesvol geüpdatet en gedeployed',
|
||||
[],
|
||||
AlertChannel::DISCORD,
|
||||
);
|
||||
|
||||
return Command::SUCCESS;
|
||||
}
|
||||
|
||||
$this->error('Reinstall mislukt: ' . ($result['error'] ?? 'Onbekende fout'));
|
||||
$alertService->send(
|
||||
AlertType::CRITICAL_ERROR,
|
||||
'Nitro Update Mislukt: ' . ($result['error'] ?? 'Onbekende fout'),
|
||||
[],
|
||||
AlertChannel::DISCORD,
|
||||
);
|
||||
|
||||
return Command::FAILURE;
|
||||
|
||||
} catch (\Exception $e) {
|
||||
$this->error('Reinstall exception: ' . $e->getMessage());
|
||||
|
||||
return Command::FAILURE;
|
||||
}
|
||||
}
|
||||
|
||||
private function isScheduledTime(): bool
|
||||
{
|
||||
$scheduleTime = setting('nitro_auto_update_schedule', '03:00');
|
||||
$scheduleDays = setting('nitro_auto_update_days', '0,6');
|
||||
$enabled = setting('nitro_auto_update_enabled', false);
|
||||
|
||||
if (! $enabled) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$now = now();
|
||||
$currentTime = $now->format('H:i');
|
||||
$currentDay = (int) $now->dayOfWeek;
|
||||
|
||||
$allowedDays = array_map(intval(...), explode(',', $scheduleDays));
|
||||
|
||||
if (! in_array($currentDay, $allowedDays)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if ($currentTime !== $scheduleTime) {
|
||||
$minuteDiff = abs(strtotime($currentTime) - strtotime((string) $scheduleTime)) / 60;
|
||||
if ($minuteDiff > 5) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -1,49 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Console\Commands;
|
||||
|
||||
use App\Services\NitroUpdateService;
|
||||
use App\Services\SettingsService;
|
||||
use Illuminate\Console\Command;
|
||||
use Illuminate\Support\Facades\Cache;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
|
||||
class SwitchNitroBranch extends Command
|
||||
{
|
||||
#[\Override]
|
||||
protected $signature = 'app:switch-nitro-branch {--branch=main}';
|
||||
|
||||
#[\Override]
|
||||
protected $description = 'Switch Nitro to a specific branch (runs in background)';
|
||||
|
||||
public function handle(): int
|
||||
{
|
||||
$branch = $this->option('branch') ?? 'main';
|
||||
|
||||
$this->info("🔄 Switching Nitro to branch: {$branch}");
|
||||
|
||||
try {
|
||||
$nitroService = new NitroUpdateService;
|
||||
$result = $nitroService->updateNitro(true);
|
||||
|
||||
if ($result['success'] ?? false) {
|
||||
$this->info("✅ Switched to {$branch} successfully!");
|
||||
$this->info($result['message'] ?? '');
|
||||
Log::info('[NitroSwitch] Success', ['branch' => $branch, 'message' => $result['message'] ?? '']);
|
||||
} else {
|
||||
$this->error('❌ Switch failed: ' . ($result['error'] ?? 'Unknown error'));
|
||||
Log::error('[NitroSwitch] Failed', ['branch' => $branch, 'error' => $result['error'] ?? 'Unknown']);
|
||||
}
|
||||
|
||||
Cache::forget('website_settings');
|
||||
SettingsService::clearCache();
|
||||
|
||||
return ($result['success'] ?? false) ? 0 : 1;
|
||||
} catch (\Exception $e) {
|
||||
$this->error('❌ Exception: ' . $e->getMessage());
|
||||
Log::error('[NitroSwitch] Exception', ['branch' => $branch, 'error' => $e->getMessage()]);
|
||||
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,251 +0,0 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Console\Commands;
|
||||
|
||||
use App\Services\EmulatorUpdateService;
|
||||
use App\Services\NitroUpdateService;
|
||||
use Illuminate\Console\Command;
|
||||
use Illuminate\Support\Facades\Process;
|
||||
|
||||
class SystemHealthCommand extends Command
|
||||
{
|
||||
#[\Override]
|
||||
protected $signature = 'system:health
|
||||
{--json : Output als JSON}
|
||||
{--details : Toon meer details}';
|
||||
|
||||
#[\Override]
|
||||
protected $description = 'Controleer systeem gezondheid';
|
||||
|
||||
public function handle(EmulatorUpdateService $emuService, NitroUpdateService $nitroService): int
|
||||
{
|
||||
$json = $this->option('json');
|
||||
$this->option('details');
|
||||
|
||||
$health = $this->performHealthCheck($emuService, $nitroService);
|
||||
|
||||
if ($json) {
|
||||
$this->line(json_encode($health, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
|
||||
|
||||
return $health['status'] === 'healthy' ? 0 : 1;
|
||||
}
|
||||
|
||||
$this->displayHealthCheck($health);
|
||||
|
||||
return $health['status'] === 'healthy' ? 0 : 1;
|
||||
}
|
||||
|
||||
private function performHealthCheck(EmulatorUpdateService $emuService, NitroUpdateService $nitroService): array
|
||||
{
|
||||
$checks = [];
|
||||
$issues = [];
|
||||
$warnings = [];
|
||||
|
||||
$checks['timestamp'] = now()->toIso8601String();
|
||||
|
||||
$checks['php'] = [
|
||||
'version' => PHP_VERSION,
|
||||
'status' => 'ok',
|
||||
];
|
||||
|
||||
$checks['system'] = [
|
||||
'os' => PHP_OS,
|
||||
'user' => posix_getpwuid(posix_geteuid())['name'] ?? 'unknown',
|
||||
];
|
||||
|
||||
$diskFree = @disk_free_space('/');
|
||||
$diskTotal = @disk_total_space('/');
|
||||
$diskPercent = $diskTotal > 0 ? round(($diskFree / $diskTotal) * 100, 1) : 0;
|
||||
$checks['disk'] = [
|
||||
'free' => $this->formatBytes($diskFree),
|
||||
'total' => $this->formatBytes($diskTotal),
|
||||
'percent_free' => $diskPercent,
|
||||
'status' => $diskPercent > 10 ? 'ok' : 'critical',
|
||||
];
|
||||
if ($diskPercent < 10) {
|
||||
$issues[] = 'Disk space critically low: ' . $diskPercent . '% free';
|
||||
} elseif ($diskPercent < 20) {
|
||||
$warnings[] = 'Disk space low: ' . $diskPercent . '% free';
|
||||
}
|
||||
|
||||
try {
|
||||
$emuDiagnosis = $emuService->diagnose();
|
||||
$checks['emulator'] = [
|
||||
'configured' => $emuDiagnosis['checks']['is_configured'] ?? false,
|
||||
'jar_exists' => $emuDiagnosis['checks']['jar_exists'] ?? false,
|
||||
'service_running' => $emuDiagnosis['checks']['service_running'] ?? false,
|
||||
'db_connected' => $emuDiagnosis['checks']['emulator_db_connected'] ?? false,
|
||||
'status' => empty($emuDiagnosis['issues']) ? 'ok' : 'issues',
|
||||
'issues' => $emuDiagnosis['issues'] ?? [],
|
||||
];
|
||||
|
||||
if (! empty($emuDiagnosis['issues'])) {
|
||||
foreach ($emuDiagnosis['issues'] as $issue) {
|
||||
$issues[] = 'Emulator: ' . $issue;
|
||||
}
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
$checks['emulator'] = [
|
||||
'status' => 'error',
|
||||
'error' => $e->getMessage(),
|
||||
];
|
||||
$issues[] = 'Emulator check failed: ' . $e->getMessage();
|
||||
}
|
||||
|
||||
try {
|
||||
$nitroDiagnosis = $nitroService->diagnose();
|
||||
$checks['nitro'] = [
|
||||
'client_installed' => $nitroDiagnosis['checks']['client_installed'] ?? false,
|
||||
'renderer_installed' => $nitroDiagnosis['checks']['renderer_installed'] ?? false,
|
||||
'deployed' => $nitroDiagnosis['checks']['deployed'] ?? false,
|
||||
'status' => empty($nitroDiagnosis['issues']) ? 'ok' : 'issues',
|
||||
'issues' => $nitroDiagnosis['issues'] ?? [],
|
||||
];
|
||||
|
||||
if (! empty($nitroDiagnosis['issues'])) {
|
||||
foreach ($nitroDiagnosis['issues'] as $issue) {
|
||||
$issues[] = 'Nitro: ' . $issue;
|
||||
}
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
$checks['nitro'] = [
|
||||
'status' => 'error',
|
||||
'error' => $e->getMessage(),
|
||||
];
|
||||
$issues[] = 'Nitro check failed: ' . $e->getMessage();
|
||||
}
|
||||
|
||||
try {
|
||||
$sqlDiagnosis = $emuService->diagnoseSqlUpdates();
|
||||
$checks['sql_updates'] = [
|
||||
'table_exists' => $sqlDiagnosis['table_exists'] ?? false,
|
||||
'applied' => $sqlDiagnosis['applied_count'] ?? 0,
|
||||
'pending' => $sqlDiagnosis['pending_count'] ?? 0,
|
||||
'status' => ($sqlDiagnosis['pending_count'] ?? 0) > 0 ? 'pending' : 'ok',
|
||||
];
|
||||
|
||||
if (($sqlDiagnosis['pending_count'] ?? 0) > 0) {
|
||||
$warnings[] = $sqlDiagnosis['pending_count'] . ' SQL updates pending';
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
$checks['sql_updates'] = [
|
||||
'status' => 'error',
|
||||
'error' => $e->getMessage(),
|
||||
];
|
||||
}
|
||||
|
||||
$webserverCheck = Process::timeout(5)->run('which nginx || which apache2 || which httpd');
|
||||
$checks['webserver'] = [
|
||||
'installed' => $webserverCheck->successful(),
|
||||
'status' => $webserverCheck->successful() ? 'ok' : 'unknown',
|
||||
];
|
||||
|
||||
$mysqlCheck = Process::timeout(5)->run('which mysql || which mariadb');
|
||||
$checks['database'] = [
|
||||
'client_installed' => $mysqlCheck->successful(),
|
||||
'status' => $mysqlCheck->successful() ? 'ok' : 'unknown',
|
||||
];
|
||||
|
||||
$nodeCheck = Process::timeout(5)->run('which node && which yarn');
|
||||
$checks['node'] = [
|
||||
'installed' => $nodeCheck->successful(),
|
||||
'status' => $nodeCheck->successful() ? 'ok' : 'missing',
|
||||
];
|
||||
if (! $nodeCheck->successful()) {
|
||||
$warnings[] = 'Node.js/Yarn niet geïnstalleerd';
|
||||
}
|
||||
|
||||
$status = $issues === [] ? 'healthy' : ($warnings === [] ? 'warning' : 'degraded');
|
||||
|
||||
return [
|
||||
'status' => $status,
|
||||
'checks' => $checks,
|
||||
'issues' => $issues,
|
||||
'warnings' => $warnings,
|
||||
];
|
||||
}
|
||||
|
||||
private function displayHealthCheck(array $health): void
|
||||
{
|
||||
$status = $health['status'];
|
||||
|
||||
$statusIcon = match ($status) {
|
||||
'healthy' => '✅',
|
||||
'warning' => '⚠️',
|
||||
'degraded' => '❌',
|
||||
default => '❓',
|
||||
};
|
||||
|
||||
$this->info("{$statusIcon} Systeem Gezondheid: " . strtoupper($status));
|
||||
$this->line('═══════════════════════════════════════════════');
|
||||
|
||||
$checks = $health['checks'] ?? [];
|
||||
|
||||
$this->line('📦 Systeem:');
|
||||
$this->line(' PHP: ' . ($checks['php']['version'] ?? '?'));
|
||||
$this->line(' User: ' . ($checks['system']['user'] ?? '?'));
|
||||
|
||||
$diskStatus = $checks['disk']['status'] ?? '?';
|
||||
$diskIcon = $diskStatus === 'ok' ? '✅' : '❌';
|
||||
$this->line(" {$diskIcon} Disk: " . ($checks['disk']['percent_free'] ?? '?') . '% vrij');
|
||||
|
||||
$emuStatus = $checks['emulator']['status'] ?? '?';
|
||||
$emuIcon = $emuStatus === 'ok' ? '✅' : '⚠️';
|
||||
$this->line(" {$emuIcon} Emulator: " . ucfirst($emuStatus));
|
||||
|
||||
$nitroStatus = $checks['nitro']['status'] ?? '?';
|
||||
$nitroIcon = $nitroStatus === 'ok' ? '✅' : '⚠️';
|
||||
$this->line(" {$nitroIcon} Nitro: " . ucfirst($nitroStatus));
|
||||
|
||||
$sqlStatus = $checks['sql_updates']['status'] ?? '?';
|
||||
$sqlIcon = $sqlStatus === 'ok' ? '✅' : '⚠️';
|
||||
$this->line(" {$sqlIcon} SQL Updates: " . ucfirst($sqlStatus) . ' (' . ($checks['sql_updates']['applied'] ?? 0) . ' toegepast)');
|
||||
|
||||
$nodeStatus = $checks['node']['status'] ?? '?';
|
||||
$nodeIcon = $nodeStatus === 'ok' ? '✅' : '❌';
|
||||
$this->line(" {$nodeIcon} Node.js: " . ucfirst($nodeStatus));
|
||||
|
||||
if (! empty($health['issues'])) {
|
||||
$this->line('');
|
||||
$this->error('❌ Problemen:');
|
||||
foreach ($health['issues'] as $issue) {
|
||||
$this->line(' - ' . $issue);
|
||||
}
|
||||
}
|
||||
|
||||
if (! empty($health['warnings'])) {
|
||||
$this->line('');
|
||||
$this->warn('⚠️ Waarschuwingen:');
|
||||
foreach ($health['warnings'] as $warning) {
|
||||
$this->line(' - ' . $warning);
|
||||
}
|
||||
}
|
||||
|
||||
$this->line('═══════════════════════════════════════════════');
|
||||
|
||||
if ($status === 'healthy') {
|
||||
$this->info('✅ Alles werkt correct!');
|
||||
} else {
|
||||
$this->warn('Run "php artisan system:repair" om problemen op te lossen');
|
||||
}
|
||||
}
|
||||
|
||||
private function formatBytes(?float $bytes): string
|
||||
{
|
||||
if ($bytes === null) {
|
||||
return 'N/A';
|
||||
}
|
||||
|
||||
$units = ['B', 'KB', 'MB', 'GB', 'TB'];
|
||||
$i = 0;
|
||||
|
||||
while ($bytes >= 1024 && $i < count($units) - 1) {
|
||||
$bytes /= 1024;
|
||||
$i++;
|
||||
}
|
||||
|
||||
return round($bytes, 2) . ' ' . $units[$i];
|
||||
}
|
||||
}
|
||||
@@ -1,213 +0,0 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Console\Commands;
|
||||
|
||||
use App\Services\AlertService;
|
||||
use App\Services\EmulatorUpdateService;
|
||||
use App\Services\NitroUpdateService;
|
||||
use Illuminate\Console\Command;
|
||||
use Illuminate\Support\Facades\Cache;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Illuminate\Support\Facades\Process;
|
||||
|
||||
class SystemRepairCommand extends Command
|
||||
{
|
||||
#[\Override]
|
||||
protected $signature = 'system:repair
|
||||
{--emu : Alleen emulator repareren}
|
||||
{--nitro : Alleen Nitro repareren}
|
||||
{--check : Alleen controleren, niet repareren}
|
||||
{--force : Forceer reparatie ook al is alles OK}
|
||||
{--full : Volledige reset en reinstall}
|
||||
{--nuke : Alles verwijderen en opnieuw installeren (gevaarlijk!)}';
|
||||
|
||||
#[\Override]
|
||||
protected $description = 'Automatische systeem reparatie voor emulator en Nitro';
|
||||
|
||||
private const string CACHE_KEY_LAST_REPAIR = 'system_last_repair';
|
||||
|
||||
public function handle(AlertService $alertService, EmulatorUpdateService $emuService, NitroUpdateService $nitroService): int
|
||||
{
|
||||
$this->info('🔧 System Repair Service gestart...');
|
||||
$this->line('═══════════════════════════════════════════════');
|
||||
|
||||
$checkOnly = $this->option('check');
|
||||
$force = $this->option('force');
|
||||
$full = $this->option('full');
|
||||
$emuOnly = $this->option('emu');
|
||||
$nitroOnly = $this->option('nitro');
|
||||
|
||||
$results = [
|
||||
'emulator' => null,
|
||||
'nitro' => null,
|
||||
];
|
||||
|
||||
if (! $nitroOnly) {
|
||||
$results['emulator'] = $this->repairEmulator($emuService, $checkOnly, $force, $full);
|
||||
}
|
||||
|
||||
if (! $emuOnly) {
|
||||
$results['nitro'] = $this->repairNitro($nitroService, $checkOnly, $force, $full);
|
||||
}
|
||||
|
||||
Cache::put(self::CACHE_KEY_LAST_REPAIR, now()->toIso8601String());
|
||||
|
||||
$emuOk = $results['emulator'] === null || ($results['emulator']['success'] ?? false);
|
||||
$nitroOk = $results['nitro'] === null || ($results['nitro']['success'] ?? false);
|
||||
|
||||
$this->line('═══════════════════════════════════════════════');
|
||||
if ($emuOk && $nitroOk) {
|
||||
$this->info('✅ Alle systemen OK');
|
||||
|
||||
return Command::SUCCESS;
|
||||
}
|
||||
|
||||
return Command::FAILURE;
|
||||
}
|
||||
|
||||
private function ensureBaseDirectories(): void
|
||||
{
|
||||
$basePaths = [
|
||||
'/var/www',
|
||||
'/var/www/atomcms',
|
||||
storage_path('app'),
|
||||
];
|
||||
|
||||
foreach ($basePaths as $path) {
|
||||
if (! is_dir($path)) {
|
||||
@mkdir($path, 0755, true);
|
||||
}
|
||||
}
|
||||
|
||||
Process::timeout(5)->run('chown -R www-data:www-data /var/www/atomcms 2>/dev/null || true');
|
||||
Process::timeout(5)->run('chmod -R 755 /var/www/atomcms 2>/dev/null || true');
|
||||
}
|
||||
|
||||
private function repairEmulator(EmulatorUpdateService $service, bool $checkOnly, bool $force, bool $full): array
|
||||
{
|
||||
$this->info('Emulator controleren...');
|
||||
|
||||
$this->ensureBaseDirectories();
|
||||
|
||||
try {
|
||||
$diagnosis = $service->diagnose();
|
||||
|
||||
if (empty($diagnosis['issues']) && ! $force && ! $full) {
|
||||
$this->line(' ✅ Emulator is OK');
|
||||
|
||||
return ['success' => true, 'status' => 'ok'];
|
||||
}
|
||||
|
||||
if ($checkOnly) {
|
||||
$this->warn(' ⚠️ Emulator problemen gevonden:');
|
||||
foreach ($diagnosis['issues'] ?? [] as $issue) {
|
||||
$this->line(' - ' . $issue);
|
||||
}
|
||||
foreach ($diagnosis['recommendations'] ?? [] as $rec) {
|
||||
$this->line(' 💡 ' . $rec);
|
||||
}
|
||||
|
||||
return ['success' => false, 'status' => 'issues_found', 'issues' => $diagnosis['issues']];
|
||||
}
|
||||
|
||||
$this->warn(' 🔧 Emulator wordt gerepareerd...');
|
||||
|
||||
if ($full) {
|
||||
$this->line(' 📦 Volledige reset...');
|
||||
$repairResult = $service->repairEmulator();
|
||||
} else {
|
||||
$repairResult = $service->repairEmulator();
|
||||
}
|
||||
|
||||
if ($repairResult['success']) {
|
||||
$this->info(' ✅ Emulator gerepareerd!');
|
||||
foreach ($repairResult['actions'] ?? [] as $action) {
|
||||
$this->line(' - ' . $action);
|
||||
}
|
||||
|
||||
return ['success' => true, 'status' => 'repaired', 'actions' => $repairResult['actions']];
|
||||
}
|
||||
|
||||
$this->error(' ❌ Emulator repair mislukt: ' . ($repairResult['error'] ?? 'Onbekend'));
|
||||
if (! empty($repairResult['actions'])) {
|
||||
$this->line(' Uitgevoerde acties:');
|
||||
foreach ($repairResult['actions'] as $action) {
|
||||
$this->line(' - ' . $action);
|
||||
}
|
||||
}
|
||||
|
||||
return ['success' => false, 'status' => 'failed', 'error' => $repairResult['error']];
|
||||
|
||||
} catch (\Exception $e) {
|
||||
$this->error(' ❌ Emulator exception: ' . $e->getMessage());
|
||||
Log::error('[SystemRepair] Emulator exception', ['error' => $e->getMessage()]);
|
||||
|
||||
return ['success' => false, 'status' => 'exception', 'error' => $e->getMessage()];
|
||||
}
|
||||
}
|
||||
|
||||
private function repairNitro(NitroUpdateService $service, bool $checkOnly, bool $force, bool $full): array
|
||||
{
|
||||
$this->info('Nitro controleren...');
|
||||
|
||||
$this->ensureBaseDirectories();
|
||||
|
||||
try {
|
||||
$diagnosis = $service->diagnose();
|
||||
|
||||
if (empty($diagnosis['issues']) && ! $force && ! $full) {
|
||||
$this->line(' ✅ Nitro is OK');
|
||||
|
||||
return ['success' => true, 'status' => 'ok'];
|
||||
}
|
||||
|
||||
if ($checkOnly) {
|
||||
$this->warn(' ⚠️ Nitro problemen gevonden:');
|
||||
foreach ($diagnosis['issues'] ?? [] as $issue) {
|
||||
$this->line(' - ' . $issue);
|
||||
}
|
||||
foreach ($diagnosis['recommendations'] ?? [] as $rec) {
|
||||
$this->line(' 💡 ' . $rec);
|
||||
}
|
||||
|
||||
return ['success' => false, 'status' => 'issues_found', 'issues' => $diagnosis['issues']];
|
||||
}
|
||||
|
||||
$this->warn(' 🔧 Nitro wordt gerepareerd...');
|
||||
|
||||
if ($full) {
|
||||
$this->line(' 📦 Volledige reset...');
|
||||
$repairResult = $service->updateNitro();
|
||||
} else {
|
||||
$repairResult = $service->repair();
|
||||
}
|
||||
|
||||
if ($repairResult['success']) {
|
||||
$this->info(' ✅ Nitro gerepareerd!');
|
||||
foreach ($repairResult['actions'] ?? [] as $action) {
|
||||
$this->line(' - ' . $action);
|
||||
}
|
||||
|
||||
return ['success' => true, 'status' => 'repaired', 'actions' => $repairResult['actions']];
|
||||
}
|
||||
|
||||
$this->error(' ❌ Nitro repair mislukt: ' . ($repairResult['error'] ?? 'Onbekend'));
|
||||
if (! empty($repairResult['actions'])) {
|
||||
$this->line(' Uitgevoerde acties:');
|
||||
foreach ($repairResult['actions'] as $action) {
|
||||
$this->line(' - ' . $action);
|
||||
}
|
||||
}
|
||||
|
||||
return ['success' => false, 'status' => 'failed', 'error' => $repairResult['error']];
|
||||
|
||||
} catch (\Exception $e) {
|
||||
$this->error(' ❌ Nitro exception: ' . $e->getMessage());
|
||||
Log::error('[SystemRepair] Nitro exception', ['error' => $e->getMessage()]);
|
||||
|
||||
return ['success' => false, 'status' => 'exception', 'error' => $e->getMessage()];
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -4,16 +4,10 @@ declare(strict_types=1);
|
||||
|
||||
namespace App\Console;
|
||||
|
||||
use App\Console\Commands\AutoUpdateCommand;
|
||||
use App\Console\Commands\DDoSDetectionCommand;
|
||||
use App\Console\Commands\EmulatorMonitorCommand;
|
||||
use App\Console\Commands\EmulatorUpdateCommand;
|
||||
use App\Console\Commands\FixCodeCommand;
|
||||
use App\Console\Commands\GenerateNitroConfigs;
|
||||
use App\Console\Commands\NitroUpdateCommand;
|
||||
use App\Console\Commands\SystemCheckCommand;
|
||||
use App\Console\Commands\SystemHealthCommand;
|
||||
use App\Console\Commands\SystemRepairCommand;
|
||||
use Illuminate\Console\Scheduling\Schedule;
|
||||
use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
|
||||
|
||||
@@ -28,9 +22,6 @@ class Kernel extends ConsoleKernel
|
||||
$schedule->command('maintenance:check-scheduled')->everyMinute()->withoutOverlapping();
|
||||
$schedule->command('monitor:emulator')->everyMinute()->withoutOverlapping();
|
||||
$schedule->command('monitor:ddos')->everyFiveMinutes()->withoutOverlapping();
|
||||
$schedule->command('update:auto')->everyMinute()->withoutOverlapping();
|
||||
$schedule->command('nitro:auto')->everyMinute()->withoutOverlapping();
|
||||
$schedule->command('system:repair')->everyTenMinutes()->withoutOverlapping();
|
||||
}
|
||||
|
||||
#[\Override]
|
||||
@@ -42,12 +33,6 @@ class Kernel extends ConsoleKernel
|
||||
$this->commands[] = FixCodeCommand::class;
|
||||
$this->commands[] = EmulatorMonitorCommand::class;
|
||||
$this->commands[] = DDoSDetectionCommand::class;
|
||||
$this->commands[] = EmulatorUpdateCommand::class;
|
||||
$this->commands[] = AutoUpdateCommand::class;
|
||||
$this->commands[] = NitroUpdateCommand::class;
|
||||
$this->commands[] = SystemRepairCommand::class;
|
||||
$this->commands[] = SystemHealthCommand::class;
|
||||
$this->commands[] = GenerateNitroConfigs::class;
|
||||
|
||||
require base_path('routes/console.php');
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -5,7 +5,6 @@ declare(strict_types=1);
|
||||
namespace App\Filament\Pages\Monitoring;
|
||||
|
||||
use App\Actions\Commandocentrum\EmulatorControlAction;
|
||||
use App\Actions\Commandocentrum\NitroControlAction;
|
||||
use App\Enums\AlertSeverity;
|
||||
use App\Models\Miscellaneous\WebsitePermission;
|
||||
use App\Models\StaffActivity;
|
||||
@@ -16,7 +15,6 @@ use App\Services\Diagnostics\DiagnosticRunner;
|
||||
use App\Services\GitHubService;
|
||||
use App\Services\RconService;
|
||||
use App\Services\SettingsService;
|
||||
use App\Services\UpdateHistoryService;
|
||||
use BackedEnum;
|
||||
use Exception;
|
||||
use Filament\Actions\Action;
|
||||
@@ -106,21 +104,6 @@ final class Commandocentrum extends Page implements HasForms
|
||||
'emulator_database_username' => $this->getSetting('emulator_database_username', ''),
|
||||
'emulator_database_password' => $this->getSetting('emulator_database_password', ''),
|
||||
'emulator_version' => $this->getSetting('emulator_version', 'Onbekend'),
|
||||
'auto_update_enabled' => $this->getSettingBool('auto_update_enabled'),
|
||||
'auto_update_schedule' => $this->getSetting('auto_update_schedule', '03:00'),
|
||||
'auto_update_days' => $this->getSetting('auto_update_days', '0,6'),
|
||||
'nitro_client_path' => $this->getSetting('nitro_client_path', $paths['nitro_client_path']),
|
||||
'nitro_renderer_path' => $this->getSetting('nitro_renderer_path', $paths['nitro_renderer_path']),
|
||||
'nitro_build_path' => $this->getSetting('nitro_build_path', $paths['nitro_build_path']),
|
||||
'nitro_webroot' => $this->getSetting('nitro_webroot', $paths['nitro_webroot']),
|
||||
'gamedata_path' => $this->getSetting('gamedata_path', $paths['gamedata_path']),
|
||||
'nitro_github_branch' => $this->getSetting('nitro_github_branch', 'main'),
|
||||
'nitro_github_url' => $this->getSetting('nitro_github_url', ''),
|
||||
'nitro_site_url' => $this->getSetting('nitro_site_url', $this->getCurrentSiteUrl()),
|
||||
'nitro_auto_update_configs' => $this->getSettingBool('nitro_auto_update_configs'),
|
||||
'nitro_auto_update_enabled' => $this->getSettingBool('nitro_auto_update_enabled'),
|
||||
'nitro_auto_update_schedule' => $this->getSetting('nitro_auto_update_schedule', '03:00'),
|
||||
'nitro_auto_update_days' => $this->getSetting('nitro_auto_update_days', '0,6'),
|
||||
'hotel_alert_message' => '',
|
||||
];
|
||||
}
|
||||
@@ -233,92 +216,6 @@ final class Commandocentrum extends Page implements HasForms
|
||||
->content(fn () => $this->renderEmulatorInfoView()),
|
||||
]),
|
||||
|
||||
Section::make(__('commandocentrum.emulator_updates'))
|
||||
->description(__('commandocentrum.emulator_updates_desc'))
|
||||
->icon('heroicon-o-arrow-down-circle')
|
||||
->afterHeader([
|
||||
Action::make('check_updates')
|
||||
->label(__('commandocentrum.check_updates'))
|
||||
->color('info')
|
||||
->action('checkEmulatorUpdates'),
|
||||
Action::make('build_emulator')
|
||||
->label('🔨 ' . __('commandocentrum.build'))
|
||||
->color('success')
|
||||
->action('buildEmulator'),
|
||||
Action::make('run_sql')
|
||||
->label(__('commandocentrum.sql_updates'))
|
||||
->color('purple')
|
||||
->action('runSqlUpdates'),
|
||||
Action::make('save_emulator')
|
||||
->label(__('commandocentrum.save'))
|
||||
->color('primary')
|
||||
->action('saveEmulator'),
|
||||
])
|
||||
->schema([
|
||||
Placeholder::make('emulator_settings')
|
||||
->label('')
|
||||
->content(fn () => $this->renderEmulatorSettingsView()),
|
||||
]),
|
||||
|
||||
Section::make(__('commandocentrum.emulator_backups'))
|
||||
->description(__('commandocentrum.emulator_backups_desc'))
|
||||
->icon('heroicon-s-archive-box')
|
||||
->schema([
|
||||
Placeholder::make('backups_list')
|
||||
->label('')
|
||||
->content(fn () => $this->renderBackupsListView()),
|
||||
]),
|
||||
|
||||
Section::make(__('commandocentrum.nitro_client'))
|
||||
->description(__('commandocentrum.nitro_client_desc'))
|
||||
->icon('heroicon-o-cloud-arrow-down')
|
||||
->afterHeader([
|
||||
Action::make('detect_paths')
|
||||
->label('🔍 ' . __('commandocentrum.auto_detect'))
|
||||
->color('success')
|
||||
->action('detectAndSavePaths'),
|
||||
Action::make('check_nitro')
|
||||
->label(__('commandocentrum.check'))
|
||||
->color('info')
|
||||
->action('checkNitroUpdates'),
|
||||
Action::make('build_nitro')
|
||||
->label(__('commandocentrum.build'))
|
||||
->color('pink')
|
||||
->action('buildNitro'),
|
||||
Action::make('generate_configs')
|
||||
->label(__('commandocentrum.generate_configs'))
|
||||
->color('indigo')
|
||||
->action('generateNitroConfigs'),
|
||||
Action::make('save_nitro')
|
||||
->label(__('commandocentrum.save'))
|
||||
->color('primary')
|
||||
->action('saveNitro'),
|
||||
])
|
||||
->schema([
|
||||
Placeholder::make('nitro_settings')
|
||||
->label('')
|
||||
->content(fn () => $this->renderNitroSettingsView()),
|
||||
]),
|
||||
|
||||
Section::make(__('commandocentrum.auto_updates'))
|
||||
->description(__('commandocentrum.auto_updates_desc'))
|
||||
->icon('heroicon-o-clock')
|
||||
->columns(2)
|
||||
->afterHeader([
|
||||
Action::make('save_auto')
|
||||
->label(__('commandocentrum.save'))
|
||||
->color('primary')
|
||||
->action('saveAutoUpdate'),
|
||||
])
|
||||
->schema([
|
||||
Toggle::make('auto_update_enabled')
|
||||
->label(__('commandocentrum.enable_auto_updates')),
|
||||
TextInput::make('auto_update_schedule')
|
||||
->label(__('commandocentrum.schedule')),
|
||||
TextInput::make('auto_update_days')
|
||||
->label(__('commandocentrum.days')),
|
||||
]),
|
||||
|
||||
Section::make(__('commandocentrum.clothing_sync'))
|
||||
->description(__('commandocentrum.clothing_sync_desc'))
|
||||
->icon('heroicon-o-user')
|
||||
@@ -367,15 +264,6 @@ final class Commandocentrum extends Page implements HasForms
|
||||
->helperText(__('commandocentrum.discord_ranks_helper')),
|
||||
]),
|
||||
|
||||
Section::make(__('commandocentrum.update_history'))
|
||||
->description(__('commandocentrum.update_history_desc'))
|
||||
->icon('heroicon-o-clock')
|
||||
->schema([
|
||||
Placeholder::make('history')
|
||||
->label('')
|
||||
->content(fn () => $this->renderUpdateHistoryView()),
|
||||
]),
|
||||
|
||||
Section::make(__('commandocentrum.social_login'))
|
||||
->description(__('commandocentrum.social_login_desc'))
|
||||
->icon('heroicon-o-user-circle')
|
||||
@@ -491,100 +379,6 @@ final class Commandocentrum extends Page implements HasForms
|
||||
]);
|
||||
}
|
||||
|
||||
private function renderEmulatorSettingsView(): View
|
||||
{
|
||||
return view('filament.components.commandocentrum.emulator-settings', [
|
||||
'emulatorBranchesHtml' => $this->getEmulatorBranchesHtml(),
|
||||
'emulatorStatusHtml' => $this->renderEmulatorStatusView()->render(),
|
||||
]);
|
||||
}
|
||||
|
||||
private function renderEmulatorStatusView(): View
|
||||
{
|
||||
$serviceName = $this->getSetting('emulator_service_name', 'arcturus');
|
||||
$jarPath = $this->getSetting('emulator_jar_path', '/var/www/Emulator');
|
||||
$sourcePath = $this->getSetting('emulator_source_path', '/var/www/emulator-source');
|
||||
$githubUrl = $this->getSetting('emulator_github_url', '');
|
||||
$branch = $this->getSetting('emulator_github_branch', 'main');
|
||||
|
||||
$jarExists = $this->fileExists($jarPath);
|
||||
$sourceExists = $this->fileExists($sourcePath);
|
||||
$sourceCommit = $this->getGitCommit($sourcePath);
|
||||
$remoteVersion = $githubUrl !== '' && $githubUrl !== '0' ? $this->getRemoteCommit($githubUrl, $branch) : 'N/A';
|
||||
|
||||
$canBuild = false;
|
||||
$checkDirs = [
|
||||
$sourcePath,
|
||||
$sourcePath . '/Emulator',
|
||||
$sourcePath . '/Emulator/Emulator',
|
||||
$sourcePath . '/emulator',
|
||||
$sourcePath . '/emulator/emulator',
|
||||
];
|
||||
foreach ($checkDirs as $dir) {
|
||||
$check = $this->runCommand('test -f ' . escapeshellarg($dir . '/pom.xml') . ' && echo yes');
|
||||
if ($check && trim($check) === 'yes') {
|
||||
$canBuild = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return view('filament.components.commandocentrum.emulator-status', [
|
||||
'emulatorOnline' => $this->getEmulatorStatusText() === 'Online',
|
||||
'jarExists' => $jarExists,
|
||||
'serviceName' => $serviceName,
|
||||
'sourceCommit' => $sourceCommit,
|
||||
'remoteVersion' => $remoteVersion,
|
||||
'canBuild' => $canBuild,
|
||||
'jarPath' => $jarPath,
|
||||
'sourcePath' => $sourcePath,
|
||||
]);
|
||||
}
|
||||
|
||||
private function renderNitroSettingsView(): View
|
||||
{
|
||||
return view('filament.components.commandocentrum.nitro-settings', [
|
||||
'nitroBranchesHtml' => $this->getNitroBranchesHtml(),
|
||||
'nitroStatusHtml' => $this->renderNitroStatusView()->render(),
|
||||
]);
|
||||
}
|
||||
|
||||
private function renderNitroStatusView(): View
|
||||
{
|
||||
$clientPath = $this->getSetting('nitro_client_path', '/var/www/nitro-client');
|
||||
$rendererPath = $this->getSetting('nitro_renderer_path', '/var/www/nitro-renderer');
|
||||
$webroot = $this->getSetting('nitro_webroot', '/var/www/Client');
|
||||
$clientGithubUrl = $this->getSetting('nitro_github_url', '');
|
||||
$rendererGithubUrl = $this->getSetting('nitro_renderer_github_url', 'https://github.com/duckietm/Nitro_Render_V3');
|
||||
|
||||
$clientCommit = $this->getGitCommit($clientPath);
|
||||
$rendererCommit = $this->getGitCommit($rendererPath);
|
||||
$clientRemote = $clientGithubUrl !== '' && $clientGithubUrl !== '0' ? $this->getRemoteCommit($clientGithubUrl, $this->getSetting('nitro_github_branch', 'main')) : 'N/A';
|
||||
$rendererRemote = $rendererGithubUrl !== '' && $rendererGithubUrl !== '0' ? $this->getRemoteCommit($rendererGithubUrl, $this->getSetting('nitro_renderer_github_branch', 'main')) : 'N/A';
|
||||
|
||||
return view('filament.components.commandocentrum.nitro-status', [
|
||||
'clientExists' => $this->checkPathExists($clientPath),
|
||||
'rendererExists' => $this->checkPathExists($rendererPath),
|
||||
'webrootExists' => $this->checkPathExists($webroot),
|
||||
'clientCommit' => $clientCommit,
|
||||
'rendererCommit' => $rendererCommit,
|
||||
'clientRemote' => $clientRemote,
|
||||
'rendererRemote' => $rendererRemote,
|
||||
]);
|
||||
}
|
||||
|
||||
private function renderBackupsListView(): View
|
||||
{
|
||||
try {
|
||||
$backups = app(EmulatorControlAction::class)->getBackups();
|
||||
} catch (Exception) {
|
||||
$backups = [];
|
||||
}
|
||||
|
||||
return view('filament.components.commandocentrum.backups-list', [
|
||||
'backups' => $backups,
|
||||
]);
|
||||
}
|
||||
|
||||
private function renderClothingStatusView(): View
|
||||
{
|
||||
try {
|
||||
@@ -614,19 +408,6 @@ final class Commandocentrum extends Page implements HasForms
|
||||
]);
|
||||
}
|
||||
|
||||
private function renderUpdateHistoryView(): View
|
||||
{
|
||||
try {
|
||||
$history = app(UpdateHistoryService::class)->getRecent(10);
|
||||
} catch (Exception) {
|
||||
$history = [];
|
||||
}
|
||||
|
||||
return view('filament.components.commandocentrum.update-history', [
|
||||
'history' => $history,
|
||||
]);
|
||||
}
|
||||
|
||||
private function getSetting(string $key, string $default = ''): string
|
||||
{
|
||||
try {
|
||||
@@ -878,33 +659,6 @@ final class Commandocentrum extends Page implements HasForms
|
||||
}
|
||||
}
|
||||
|
||||
public function checkEmulatorUpdates(): void
|
||||
{
|
||||
$result = app(EmulatorControlAction::class)->update();
|
||||
$this->notify($result['success'] ?? false ? __('commandocentrum.success') : __('commandocentrum.error'), $result['message'] ?? $result['error'] ?? __('commandocentrum.unknown'), ($result['success'] ?? false) ? 'success' : 'danger');
|
||||
Cache::forget('all_updates_check');
|
||||
$this->fillForm();
|
||||
}
|
||||
|
||||
public function buildEmulator(): void
|
||||
{
|
||||
$result = app(EmulatorControlAction::class)->build();
|
||||
$this->notify($result['success'] ?? false ? __('commandocentrum.success') : __('commandocentrum.error'), $result['message'] ?? $result['error'] ?? __('commandocentrum.unknown'), ($result['success'] ?? false) ? 'success' : 'danger');
|
||||
}
|
||||
|
||||
public function runSqlUpdates(): void
|
||||
{
|
||||
$result = app(EmulatorControlAction::class)->runSqlUpdates();
|
||||
$this->notify($result['success'] ?? false ? __('commandocentrum.success') : __('commandocentrum.error'), $result['message'] ?? __('commandocentrum.unknown'), ($result['success'] ?? false) ? 'success' : 'danger');
|
||||
}
|
||||
|
||||
public function restoreBackup(string $backupName): void
|
||||
{
|
||||
$result = app(EmulatorControlAction::class)->restoreBackup($backupName);
|
||||
$this->notify($result['success'] ? __('commandocentrum.success') : __('commandocentrum.error'), $result['message'] ?? $result['error'] ?? __('commandocentrum.unknown'), $result['success'] ? 'success' : 'danger');
|
||||
$this->fillForm();
|
||||
}
|
||||
|
||||
public function saveEmulator(): void
|
||||
{
|
||||
try {
|
||||
@@ -924,38 +678,6 @@ final class Commandocentrum extends Page implements HasForms
|
||||
}
|
||||
}
|
||||
|
||||
public function checkNitroUpdates(): void
|
||||
{
|
||||
$clientPath = $this->getSetting('nitro_client_path', '/var/www/nitro-client');
|
||||
$rendererPath = $this->getSetting('nitro_renderer_path', '/var/www/nitro-renderer');
|
||||
$branch = $this->getSetting('nitro_github_branch', 'main');
|
||||
|
||||
$result = app(NitroControlAction::class)->pullUpdates($clientPath, $rendererPath, $branch);
|
||||
$this->notify(__('commandocentrum.success'), $result['message'], 'success');
|
||||
$this->fillForm();
|
||||
}
|
||||
|
||||
public function buildNitro(): void
|
||||
{
|
||||
$clientPath = $this->getSetting('nitro_client_path', '/var/www/nitro-client');
|
||||
$rendererPath = $this->getSetting('nitro_renderer_path', '/var/www/nitro-renderer');
|
||||
$branch = $this->getSetting('nitro_github_branch', 'main');
|
||||
|
||||
$result = app(NitroControlAction::class)->build($clientPath, $rendererPath, $branch);
|
||||
$this->notify($result['success'] ? __('commandocentrum.success') : __('commandocentrum.warning'), $result['message'], $result['success'] ? 'success' : 'warning');
|
||||
}
|
||||
|
||||
public function generateNitroConfigs(): void
|
||||
{
|
||||
$siteUrl = $this->getSetting('nitro_site_url', $this->getCurrentSiteUrl());
|
||||
$webroot = $this->getSetting('nitro_webroot', '/var/www/Client');
|
||||
$gamedataPath = $this->getSetting('gamedata_path', '/var/www/Gamedata');
|
||||
|
||||
$result = app(NitroControlAction::class)->generateConfigs($siteUrl, $webroot, $gamedataPath);
|
||||
$this->notify($result['success'] ? __('commandocentrum.success') : __('commandocentrum.error'), $result['message'], $result['success'] ? 'success' : 'danger');
|
||||
$this->fillForm();
|
||||
}
|
||||
|
||||
public function syncClothing(): void
|
||||
{
|
||||
try {
|
||||
@@ -972,58 +694,6 @@ final class Commandocentrum extends Page implements HasForms
|
||||
}
|
||||
}
|
||||
|
||||
public function detectAndSavePaths(): void
|
||||
{
|
||||
try {
|
||||
$paths = $this->autoDetectPaths();
|
||||
$settings = app(SettingsService::class);
|
||||
|
||||
$settings->set('nitro_client_path', $paths['nitro_client_path']);
|
||||
$settings->set('nitro_renderer_path', $paths['nitro_renderer_path']);
|
||||
$settings->set('nitro_build_path', $paths['nitro_build_path']);
|
||||
$settings->set('nitro_webroot', $paths['nitro_webroot']);
|
||||
$settings->set('gamedata_path', $paths['gamedata_path']);
|
||||
$settings->set('emulator_jar_path', $paths['emulator_jar_path']);
|
||||
$settings->set('emulator_source_path', $paths['emulator_source_path']);
|
||||
|
||||
$this->fillForm();
|
||||
$this->notify(__('commandocentrum.success'), __('commandocentrum.paths_detected'), 'success');
|
||||
} catch (Exception $e) {
|
||||
$this->notify(__('commandocentrum.error'), $e->getMessage(), 'danger');
|
||||
}
|
||||
}
|
||||
|
||||
public function saveNitro(): void
|
||||
{
|
||||
try {
|
||||
$settings = app(SettingsService::class);
|
||||
$settings->set('nitro_client_path', $this->data['nitro_client_path'] ?? '/var/www/atomcms/nitro-client');
|
||||
$settings->set('nitro_renderer_path', $this->data['nitro_renderer_path'] ?? '/var/www/atomcms/nitro-renderer');
|
||||
$settings->set('nitro_build_path', $this->data['nitro_build_path'] ?? '/var/www/atomcms/nitro-client/dist');
|
||||
$settings->set('nitro_webroot', $this->data['nitro_webroot'] ?? '/var/www/Client');
|
||||
$settings->set('gamedata_path', $this->data['gamedata_path'] ?? '/var/www/Gamedata');
|
||||
$settings->set('nitro_github_url', $this->data['nitro_github_url'] ?? '');
|
||||
$settings->set('nitro_github_branch', $this->data['nitro_github_branch'] ?? 'main');
|
||||
$settings->set('nitro_site_url', $this->data['nitro_site_url'] ?? '');
|
||||
$this->notify(__('commandocentrum.success'), __('commandocentrum.nitro_settings_saved'), 'success');
|
||||
} catch (Exception $e) {
|
||||
$this->notify(__('commandocentrum.error'), $e->getMessage(), 'danger');
|
||||
}
|
||||
}
|
||||
|
||||
public function saveAutoUpdate(): void
|
||||
{
|
||||
try {
|
||||
$settings = app(SettingsService::class);
|
||||
$settings->set('auto_update_enabled', ($this->data['auto_update_enabled'] ?? false) ? '1' : '0');
|
||||
$settings->set('auto_update_schedule', $this->data['auto_update_schedule'] ?? '03:00');
|
||||
$settings->set('auto_update_days', $this->data['auto_update_days'] ?? '0,6');
|
||||
$this->notify(__('commandocentrum.success'), __('commandocentrum.auto_update_saved'), 'success');
|
||||
} catch (Exception $e) {
|
||||
$this->notify(__('commandocentrum.error'), $e->getMessage(), 'danger');
|
||||
}
|
||||
}
|
||||
|
||||
public function saveAlerts(): void
|
||||
{
|
||||
try {
|
||||
|
||||
@@ -5,7 +5,6 @@ declare(strict_types=1);
|
||||
namespace App\Filament\Resources\Miscellaneous\AlertLogResource;
|
||||
|
||||
use App\Models\Miscellaneous\AlertLog;
|
||||
use App\Services\EmulatorUpdateService;
|
||||
use Filament\Actions\Action;
|
||||
use Filament\Notifications\Notification;
|
||||
use Filament\Resources\Resource;
|
||||
@@ -136,14 +135,12 @@ class AlertLogResource extends Resource
|
||||
->icon('heroicon-o-trash')
|
||||
->color('gray')
|
||||
->action(function () {
|
||||
$updateService = new EmulatorUpdateService;
|
||||
$result = $updateService->clearAllLogs();
|
||||
Cache::flush();
|
||||
AlertLog::truncate();
|
||||
Notification::make()
|
||||
->success()
|
||||
->title('🗑️ Alle Logs Geleegd!')
|
||||
->body($result['message'])
|
||||
->body('Alle logs zijn gewist.')
|
||||
->send();
|
||||
})
|
||||
->requiresConfirmation(),
|
||||
|
||||
@@ -1,343 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Filament\Widgets;
|
||||
|
||||
use App\Services\EmulatorUpdateService;
|
||||
use App\Services\NitroUpdateService;
|
||||
use App\Services\RconService;
|
||||
use Filament\Notifications\Notification;
|
||||
use Filament\Widgets\Widget;
|
||||
use Illuminate\Support\Facades\Cache;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
|
||||
class UpdateCheckerWidget extends Widget
|
||||
{
|
||||
#[\Override]
|
||||
protected string $view = 'filament.widgets.update-checker';
|
||||
|
||||
#[\Override]
|
||||
protected int|string|array $columnSpan = 'full';
|
||||
|
||||
#[\Override]
|
||||
protected static ?int $sort = 0;
|
||||
|
||||
public ?string $emulatorVersion = null;
|
||||
|
||||
public ?string $latestEmulatorVersion = null;
|
||||
|
||||
public bool $emulatorUpdate = false;
|
||||
|
||||
public ?string $nitroVersion = null;
|
||||
|
||||
public ?string $latestNitroVersion = null;
|
||||
|
||||
public bool $nitroUpdate = false;
|
||||
|
||||
public int $onlineUsers = 0;
|
||||
|
||||
public string $dbSize = '0 MB';
|
||||
|
||||
public bool $hasAnyUpdate = false;
|
||||
|
||||
public int $sqlApplied = 0;
|
||||
|
||||
public int $sqlPending = 0;
|
||||
|
||||
public bool $sqlTableExists = false;
|
||||
|
||||
public function mount(): void
|
||||
{
|
||||
$this->emulatorVersion = setting('emulator_version', '?');
|
||||
$this->nitroVersion = setting('nitro_client_version', '?');
|
||||
|
||||
try {
|
||||
$this->onlineUsers = (int) DB::connection('mysql')->table('users')->where('online', '1')->count();
|
||||
$sizeResult = DB::connection('mysql')->select('SELECT ROUND(SUM(data_length + index_length) / 1024 / 1024, 1) as db_size FROM information_schema.tables WHERE table_schema = DATABASE()');
|
||||
$this->dbSize = ($sizeResult[0]->db_size ?? '0') . ' MB';
|
||||
} catch (\Exception) {
|
||||
$this->dbSize = '? MB';
|
||||
}
|
||||
|
||||
$this->loadSqlStatus();
|
||||
|
||||
$cached = Cache::get('all_updates_check');
|
||||
|
||||
if ($cached !== null) {
|
||||
$this->emulatorUpdate = $cached['emulator'] ?? false;
|
||||
$this->latestEmulatorVersion = $cached['emulator_version'] ?? null;
|
||||
$this->nitroUpdate = $cached['nitro'] ?? false;
|
||||
$this->latestNitroVersion = $cached['nitro_version'] ?? null;
|
||||
$this->hasAnyUpdate = $this->emulatorUpdate || $this->nitroUpdate;
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
$this->performCheck();
|
||||
}
|
||||
|
||||
private function loadSqlStatus(): void
|
||||
{
|
||||
try {
|
||||
$updateService = new EmulatorUpdateService;
|
||||
$sqlDiagnosis = $updateService->diagnoseSqlUpdates();
|
||||
|
||||
$this->sqlTableExists = $sqlDiagnosis['table_exists'] ?? false;
|
||||
$this->sqlApplied = $sqlDiagnosis['applied_count'] ?? 0;
|
||||
$this->sqlPending = $sqlDiagnosis['pending_count'] ?? 0;
|
||||
} catch (\Exception $e) {
|
||||
Log::error('[UpdateChecker] SQL status failed: ' . $e->getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public function performCheck(): void
|
||||
{
|
||||
try {
|
||||
$updateService = new EmulatorUpdateService;
|
||||
$check = $updateService->checkForUpdates();
|
||||
$this->emulatorUpdate = $check['update_available'] ?? false;
|
||||
$this->latestEmulatorVersion = $check['latest_version'] ?? null;
|
||||
} catch (\Exception $e) {
|
||||
Log::error('[UpdateChecker] Emulator check failed: ' . $e->getMessage());
|
||||
}
|
||||
|
||||
try {
|
||||
$nitroService = new NitroUpdateService;
|
||||
$nitroCheck = $nitroService->checkForUpdates();
|
||||
$this->nitroUpdate = $nitroCheck['has_updates'] ?? false;
|
||||
if ($this->nitroUpdate) {
|
||||
$parts = [];
|
||||
if ($nitroCheck['client_update'] ?? false) {
|
||||
$parts[] = 'Client';
|
||||
}
|
||||
if ($nitroCheck['renderer_update'] ?? false) {
|
||||
$parts[] = 'Renderer';
|
||||
}
|
||||
$this->latestNitroVersion = implode(' + ', $parts);
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
Log::error('[UpdateChecker] Nitro check failed: ' . $e->getMessage());
|
||||
}
|
||||
|
||||
$this->hasAnyUpdate = $this->emulatorUpdate || $this->nitroUpdate;
|
||||
|
||||
Cache::put('all_updates_check', [
|
||||
'emulator' => $this->emulatorUpdate,
|
||||
'emulator_version' => $this->latestEmulatorVersion,
|
||||
'nitro' => $this->nitroUpdate,
|
||||
'nitro_version' => $this->latestNitroVersion,
|
||||
], now()->addMinutes(15));
|
||||
}
|
||||
|
||||
public function forceCheck(): void
|
||||
{
|
||||
try {
|
||||
Cache::forget('all_updates_check');
|
||||
$updateService = new EmulatorUpdateService;
|
||||
$updateService->resetInstalledDate();
|
||||
$this->performCheck();
|
||||
|
||||
if ($this->hasAnyUpdate) {
|
||||
Notification::make()->success()->title('Updates Gevonden!')->body('Klik op "Alles Updaten" om te installeren')->send();
|
||||
} else {
|
||||
Notification::make()->info()->title('Geen Updates')->body('Alles is al up-to-date')->send();
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
Notification::make()->danger()->title('Fout')->body($e->getMessage())->send();
|
||||
}
|
||||
}
|
||||
|
||||
public function repairSystem(): void
|
||||
{
|
||||
try {
|
||||
Cache::forget('all_updates_check');
|
||||
|
||||
$messages = [];
|
||||
$errors = [];
|
||||
|
||||
try {
|
||||
$emuService = new EmulatorUpdateService;
|
||||
$repairResult = $emuService->repairEmulator();
|
||||
|
||||
if ($repairResult['success']) {
|
||||
$messages[] = '🖥️ Emulator: ' . ($repairResult['message'] ?? 'Gerepareerd');
|
||||
} else {
|
||||
$errors[] = 'Emulator: ' . ($repairResult['error'] ?? 'Onbekende fout');
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
$errors[] = 'Emulator: ' . $e->getMessage();
|
||||
}
|
||||
|
||||
try {
|
||||
$nitroService = new NitroUpdateService;
|
||||
$repairResult = $nitroService->repair();
|
||||
|
||||
if ($repairResult['success']) {
|
||||
$messages[] = '🎮 Nitro: ' . ($repairResult['message'] ?? 'Gerepareerd');
|
||||
} else {
|
||||
$errors[] = 'Nitro: ' . ($repairResult['error'] ?? 'Onbekende fout');
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
$errors[] = 'Nitro: ' . $e->getMessage();
|
||||
}
|
||||
|
||||
if ($messages !== []) {
|
||||
Notification::make()->success()->title('Reparatie Voltooid!')->body(implode(' | ', $messages))->send();
|
||||
}
|
||||
|
||||
if ($errors !== []) {
|
||||
Notification::make()->danger()->title('Reparatie Fout')->body(implode(' | ', $errors))->send();
|
||||
}
|
||||
|
||||
Cache::forget('all_updates_check');
|
||||
$this->mount();
|
||||
} catch (\Exception $e) {
|
||||
Notification::make()->danger()->title('Fout')->body($e->getMessage())->send();
|
||||
}
|
||||
}
|
||||
|
||||
public function diagnoseSystem(): void
|
||||
{
|
||||
try {
|
||||
$emuService = new EmulatorUpdateService;
|
||||
$nitroService = new NitroUpdateService;
|
||||
|
||||
$emuDiagnosis = $emuService->diagnose();
|
||||
$nitroDiagnosis = $nitroService->diagnose();
|
||||
|
||||
$issues = array_merge(
|
||||
$emuDiagnosis['issues'] ?? [],
|
||||
$nitroDiagnosis['issues'] ?? [],
|
||||
);
|
||||
|
||||
$recommendations = array_merge(
|
||||
$emuDiagnosis['recommendations'] ?? [],
|
||||
$nitroDiagnosis['recommendations'] ?? [],
|
||||
);
|
||||
|
||||
if ($issues === []) {
|
||||
Notification::make()->info()->title('Diagnose')->body('Geen problemen gevonden')->send();
|
||||
} else {
|
||||
$body = 'Problemen: ' . implode(', ', $issues);
|
||||
if ($recommendations !== []) {
|
||||
$body .= "\n\nAanbevelingen: " . implode(', ', $recommendations);
|
||||
}
|
||||
Notification::make()->warning()->title('Diagnose Resultaat')->body($body)->send();
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
Notification::make()->danger()->title('Fout')->body($e->getMessage())->send();
|
||||
}
|
||||
}
|
||||
|
||||
public function updateAll(): void
|
||||
{
|
||||
try {
|
||||
Cache::forget('all_updates_check');
|
||||
Cache::forget('website_settings');
|
||||
|
||||
$messages = [];
|
||||
$errors = [];
|
||||
$updateService = new EmulatorUpdateService;
|
||||
|
||||
try {
|
||||
$result = $updateService->updateEmulator();
|
||||
if ($result['success']) {
|
||||
$messages[] = '🖥️ ' . ($result['message'] ?? 'Emulator geüpdatet');
|
||||
} else {
|
||||
$error = $result['error'] ?? '';
|
||||
if (str_contains($error, 'al up-to-date')) {
|
||||
$messages[] = '🖥️ Emulator al up-to-date';
|
||||
} else {
|
||||
$errors[] = 'Emulator: ' . $error;
|
||||
}
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
$errors[] = 'Emulator: ' . $e->getMessage();
|
||||
}
|
||||
|
||||
try {
|
||||
$nitroService = new NitroUpdateService;
|
||||
$nitroCheck = $nitroService->checkForUpdates();
|
||||
|
||||
if ($nitroCheck['has_updates'] ?? false) {
|
||||
$result = $nitroService->updateNitro();
|
||||
if ($result['success']) {
|
||||
$parts = [];
|
||||
if ($result['renderer_updated'] ?? false) {
|
||||
$parts[] = 'Renderer';
|
||||
}
|
||||
if ($result['client_updated'] ?? false) {
|
||||
$parts[] = 'Client';
|
||||
}
|
||||
if ($result['built'] ?? false) {
|
||||
$parts[] = 'Build';
|
||||
}
|
||||
if ($result['deployed'] ?? false) {
|
||||
$parts[] = 'Deploy';
|
||||
}
|
||||
if ($parts !== []) {
|
||||
$messages[] = '🎮 Nitro: ' . implode(', ', $parts);
|
||||
}
|
||||
} elseif (! empty($result['errors'] ?? [])) {
|
||||
$errors = array_merge($errors, $result['errors']);
|
||||
}
|
||||
} else {
|
||||
$messages[] = '🎮 Nitro al up-to-date';
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
$errors[] = 'Nitro: ' . $e->getMessage();
|
||||
}
|
||||
|
||||
try {
|
||||
$sqlResult = $updateService->runSqlUpdates();
|
||||
if ($sqlResult['sql_updated'] ?? false) {
|
||||
$count = count($sqlResult['files_run'] ?? []);
|
||||
if ($count > 0) {
|
||||
$messages[] = "📊 {$count} SQL updates";
|
||||
}
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
$errors[] = 'SQL: ' . $e->getMessage();
|
||||
}
|
||||
|
||||
try {
|
||||
$updateService->restartEmulator();
|
||||
$messages[] = '🔄 Emulator herstart';
|
||||
} catch (\Exception $e) {
|
||||
Log::error('[UpdateChecker] Restart failed: ' . $e->getMessage());
|
||||
}
|
||||
|
||||
try {
|
||||
$rcon = new RconService;
|
||||
$rcon->sendCommand('updatecatalog');
|
||||
$rcon->sendCommand('updatewordfilter');
|
||||
$messages[] = '📚 Catalogus + filter vernieuwd';
|
||||
} catch (\Exception $e) {
|
||||
Log::error('[UpdateChecker] RCON failed: ' . $e->getMessage());
|
||||
}
|
||||
|
||||
if ($messages !== []) {
|
||||
Notification::make()->success()->title('Updates Voltooid!')->body(implode(' | ', $messages))->send();
|
||||
}
|
||||
|
||||
if ($errors !== []) {
|
||||
Notification::make()->danger()->title('Sommige Updates Mislukt')->body(implode(' | ', $errors))->send();
|
||||
}
|
||||
|
||||
if ($messages === [] && $errors === []) {
|
||||
Notification::make()->info()->title('Geen Updates')->body('Alles was al up-to-date')->send();
|
||||
}
|
||||
|
||||
Cache::forget('all_updates_check');
|
||||
$this->mount();
|
||||
} catch (\Exception $e) {
|
||||
Notification::make()->danger()->title('Fout')->body($e->getMessage())->send();
|
||||
}
|
||||
}
|
||||
|
||||
#[\Override]
|
||||
public static function canView(): bool
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -1,272 +0,0 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Services\Emulator;
|
||||
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Illuminate\Support\Facades\Process;
|
||||
|
||||
class EmulatorBuildService
|
||||
{
|
||||
use EmulatorConfiguration;
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->loadConfiguration();
|
||||
}
|
||||
|
||||
public function buildFromSource(bool $force = false): array
|
||||
{
|
||||
$repo = $this->sourceRepo ?: $this->githubRepo;
|
||||
$branch = $this->sourceBranch ?: $this->githubBranch ?: 'main';
|
||||
|
||||
if (! $repo) {
|
||||
return ['success' => false, 'error' => 'Geen source repo geconfigureerd'];
|
||||
}
|
||||
|
||||
$sourcePath = $this->emulatorSourcePath;
|
||||
$serviceName = $this->emulatorService;
|
||||
|
||||
Log::info('[EmulatorBuild] Starting source build', [
|
||||
'repo' => $repo,
|
||||
'branch' => $branch,
|
||||
'path' => $sourcePath,
|
||||
]);
|
||||
|
||||
$this->ensureJavaInstalled();
|
||||
|
||||
Process::timeout(10)->run('mkdir -p ' . escapeshellarg(dirname((string) $sourcePath)));
|
||||
Process::timeout(10)->run('mkdir -p ' . escapeshellarg((string) $this->jarPath));
|
||||
Process::timeout(10)->run('chown -R www-data:www-data ' . escapeshellarg(dirname((string) $sourcePath)));
|
||||
|
||||
$maxRetries = 2;
|
||||
$lastError = '';
|
||||
|
||||
for ($retry = 0; $retry <= $maxRetries; $retry++) {
|
||||
Process::timeout(10)->run('chown -R www-data:www-data ' . escapeshellarg(dirname((string) $sourcePath)) . ' 2>/dev/null || true');
|
||||
Process::timeout(10)->run('chown -R www-data:www-data ' . escapeshellarg((string) $sourcePath) . ' 2>/dev/null || true');
|
||||
|
||||
if ($retry > 0) {
|
||||
Log::info('[EmulatorBuild] Retry attempt', ['attempt' => $retry]);
|
||||
Process::timeout(30)->run('rm -rf ' . escapeshellarg((string) $sourcePath));
|
||||
}
|
||||
|
||||
try {
|
||||
$existsCheck = Process::timeout(5)->run('[ -d ' . escapeshellarg((string) $sourcePath) . " ] && echo 'exists'");
|
||||
$sourceExists = $existsCheck->successful() && trim($existsCheck->output()) === 'exists';
|
||||
|
||||
$gitCheck = Process::timeout(5)->run('[ -d ' . escapeshellarg((string) $sourcePath) . "/.git ] && echo 'git'");
|
||||
$isGitRepo = $gitCheck->successful() && trim($gitCheck->output()) === 'git';
|
||||
|
||||
if ($sourceExists && $isGitRepo) {
|
||||
Log::info('[EmulatorBuild] Pulling latest changes');
|
||||
$commands = [
|
||||
'cd ' . escapeshellarg((string) $sourcePath) . ' && git fetch origin',
|
||||
'cd ' . escapeshellarg((string) $sourcePath) . ' && git checkout ' . escapeshellarg($branch),
|
||||
'cd ' . escapeshellarg((string) $sourcePath) . ' && git pull origin ' . escapeshellarg($branch),
|
||||
];
|
||||
} else {
|
||||
Log::info('[EmulatorBuild] Cloning repository');
|
||||
$commands = [
|
||||
'sudo rm -rf ' . escapeshellarg((string) $sourcePath) . ' 2>/dev/null || rm -rf ' . escapeshellarg((string) $sourcePath),
|
||||
'mkdir -p ' . escapeshellarg(dirname((string) $sourcePath)),
|
||||
'git clone --branch ' . escapeshellarg($branch) . ' --depth 1 https://github.com/' . escapeshellarg($repo) . '.git ' . escapeshellarg((string) $sourcePath),
|
||||
'chown -R www-data:www-data ' . escapeshellarg((string) $sourcePath),
|
||||
];
|
||||
}
|
||||
|
||||
$command = implode(' && ', $commands);
|
||||
$result = Process::timeout(300)->run($command);
|
||||
|
||||
if ($result->failed()) {
|
||||
$lastError = 'Git clone/pull failed: ' . substr($result->errorOutput(), 0, 300);
|
||||
Log::warning('[EmulatorBuild] Git operation failed', ['error' => $lastError, 'attempt' => $retry]);
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
$buildCommands = $this->getBuildCommands($sourcePath);
|
||||
|
||||
Log::info('[EmulatorBuild] Running build', ['command' => $buildCommands]);
|
||||
$buildResult = Process::timeout(600)->run('cd ' . escapeshellarg((string) $sourcePath) . ' && ' . $buildCommands);
|
||||
|
||||
$hasSignalError = str_contains($buildResult->errorOutput(), 'signal') || str_contains($buildResult->output(), 'signal');
|
||||
|
||||
if ($hasSignalError) {
|
||||
Log::warning('[EmulatorBuild] Build process received signal, checking if JAR was built anyway');
|
||||
}
|
||||
|
||||
$jarPath = $this->findBuiltJar($sourcePath);
|
||||
|
||||
if ($jarPath) {
|
||||
Log::info('[EmulatorBuild] JAR found despite build status', ['jar' => $jarPath]);
|
||||
} elseif ($buildResult->failed() && ! $hasSignalError) {
|
||||
$lastError = 'Build failed: ' . substr($buildResult->errorOutput(), 0, 500);
|
||||
Log::warning('[EmulatorBuild] Build failed', ['error' => $lastError, 'attempt' => $retry]);
|
||||
|
||||
if ($retry < $maxRetries) {
|
||||
$cleanCommands = [
|
||||
'cd ' . escapeshellarg((string) $sourcePath) . ' && mvn clean 2>/dev/null || ./gradlew clean 2>/dev/null || true',
|
||||
];
|
||||
Process::timeout(60)->run(implode(' && ', $cleanCommands));
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
if (! $jarPath) {
|
||||
$lastError = 'Build succeeded but JAR not found. Check build output.';
|
||||
Log::warning('[EmulatorBuild] JAR not found', ['attempt' => $retry]);
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
return $this->deployJar($jarPath, $serviceName);
|
||||
|
||||
} catch (\Exception $e) {
|
||||
$lastError = $e->getMessage();
|
||||
Log::error('[EmulatorBuild] Source build exception', ['error' => $lastError, 'attempt' => $retry]);
|
||||
}
|
||||
}
|
||||
|
||||
return [
|
||||
'success' => false,
|
||||
'error' => 'Build mislukt na ' . ($maxRetries + 1) . ' pogingen. Laatste fout: ' . $lastError,
|
||||
];
|
||||
}
|
||||
|
||||
public function getBuildCommands(string $sourcePath): string
|
||||
{
|
||||
$pomPath = $sourcePath;
|
||||
$pomCheck = Process::timeout(5)->run("[ -f {$pomPath}/pom.xml ] && echo 'pom'");
|
||||
|
||||
if (! $pomCheck->successful() || trim($pomCheck->output()) !== 'pom') {
|
||||
$pomPath = $sourcePath . '/Emulator';
|
||||
$pomCheck = Process::timeout(5)->run("[ -f {$pomPath}/pom.xml ] && echo 'pom'");
|
||||
}
|
||||
|
||||
$gradlewPath = $sourcePath . '/gradlew';
|
||||
$gradlewCheck = Process::timeout(5)->run("[ -f {$gradlewPath} ] && echo 'gradlew'");
|
||||
|
||||
$gradlePath = $sourcePath . '/build.gradle';
|
||||
$gradleCheck = Process::timeout(5)->run("[ -f {$gradlePath} ] && echo 'gradle'");
|
||||
|
||||
if ($pomCheck->successful() && trim($pomCheck->output()) === 'pom') {
|
||||
return "cd {$pomPath} && mvn clean package -DskipTests 2>&1";
|
||||
}
|
||||
|
||||
if ($gradlewCheck->successful() && trim($gradlewCheck->output()) === 'gradlew') {
|
||||
return "cd {$sourcePath} && chmod +x gradlew && ./gradlew clean build -x test 2>&1";
|
||||
}
|
||||
|
||||
if ($gradleCheck->successful() && trim($gradleCheck->output()) === 'gradle') {
|
||||
return "cd {$sourcePath} && gradle clean build -x test 2>&1";
|
||||
}
|
||||
|
||||
return "cd {$sourcePath} && ls -la";
|
||||
}
|
||||
|
||||
public function findBuiltJar(string $sourcePath): ?string
|
||||
{
|
||||
$patterns = [
|
||||
$sourcePath . '/target/*.jar',
|
||||
$sourcePath . '/build/libs/*.jar',
|
||||
$sourcePath . '/*/*.jar',
|
||||
$sourcePath . '/*.jar',
|
||||
$sourcePath . '/Emulator/target/*.jar',
|
||||
$sourcePath . '/Emulator/build/libs/*.jar',
|
||||
$sourcePath . '/Emulator/*/*.jar',
|
||||
];
|
||||
|
||||
foreach ($patterns as $pattern) {
|
||||
$result = Process::timeout(10)->run('ls -t ' . $pattern . ' 2>/dev/null | head -1');
|
||||
if ($result->successful()) {
|
||||
$jarPath = trim($result->output());
|
||||
if ($jarPath !== '' && $jarPath !== '0' && str_contains($jarPath, '.jar')) {
|
||||
return $jarPath;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private function deployJar(string $jarPath, string $serviceName): array
|
||||
{
|
||||
$jarName = basename($jarPath);
|
||||
$version = $this->extractVersionFromFilename($jarName);
|
||||
if ($version === '' || $version === '0') {
|
||||
$version = date('Y.m.d');
|
||||
}
|
||||
|
||||
$deployCommands = [
|
||||
'mkdir -p ' . escapeshellarg((string) $this->jarPath),
|
||||
'chown -R www-data:www-data ' . escapeshellarg((string) $this->jarPath),
|
||||
'if ls ' . escapeshellarg((string) $this->jarPath) . '/*.jar 1>/dev/null 2>&1; then mkdir -p ' . escapeshellarg((string) $this->jarPath) . '/backup && mv ' . escapeshellarg((string) $this->jarPath) . '/*.jar ' . escapeshellarg((string) $this->jarPath) . '/backup/; fi',
|
||||
'cp -f ' . escapeshellarg($jarPath) . ' ' . escapeshellarg((string) $this->jarPath) . '/' . escapeshellarg($jarName),
|
||||
'chown www-data:www-data ' . escapeshellarg((string) $this->jarPath) . '/' . escapeshellarg($jarName),
|
||||
'chmod 755 ' . escapeshellarg((string) $this->jarPath) . '/' . escapeshellarg($jarName),
|
||||
'ls -la ' . escapeshellarg((string) $this->jarPath) . '/',
|
||||
'systemctl restart ' . escapeshellarg((string) $serviceName) . ' 2>&1 || service ' . escapeshellarg((string) $serviceName) . ' restart 2>&1 || true',
|
||||
];
|
||||
|
||||
$deployCommand = implode(' && ', $deployCommands);
|
||||
|
||||
Log::info('[EmulatorBuild] Deploying jar', [
|
||||
'source' => $jarPath,
|
||||
'destination' => "{$this->jarPath}/{$jarName}",
|
||||
]);
|
||||
|
||||
$deployResult = Process::timeout(60)->run($deployCommand);
|
||||
|
||||
if (! $deployResult->successful()) {
|
||||
return [
|
||||
'success' => false,
|
||||
'error' => 'Deploy failed: ' . substr($deployResult->errorOutput(), 0, 300),
|
||||
];
|
||||
}
|
||||
|
||||
$sourceService = new EmulatorSourceService;
|
||||
$sourceInfo = $sourceService->checkForUpdates();
|
||||
$installedDate = $sourceInfo['latest_timestamp'] ?? time();
|
||||
|
||||
$this->settings->set('emulator_version', $version);
|
||||
$this->settings->set('emulator_jar_installed_date', (string) $installedDate);
|
||||
$this->settings->set('emulator_source_commit', $sourceInfo['latest_sha'] ?? 'unknown');
|
||||
$this->settings->set('emulator_source_date', (string) $installedDate);
|
||||
|
||||
$currentBranch = $this->sourceBranch ?: $this->githubBranch ?: 'main';
|
||||
$this->settings->set('emulator_installed_branch', $currentBranch);
|
||||
|
||||
$sqlService = new EmulatorSqlService;
|
||||
$sqlService->runUpdates();
|
||||
|
||||
Log::info('[EmulatorBuild] Source build successful');
|
||||
|
||||
return [
|
||||
'success' => true,
|
||||
'version' => $version,
|
||||
'jar' => $jarName,
|
||||
'built' => true,
|
||||
'message' => "✅ Emulator vanaf source gebouwd!\n📦 {$jarName}\n🔄 Service herstart",
|
||||
];
|
||||
}
|
||||
|
||||
private function ensureJavaInstalled(): void
|
||||
{
|
||||
$javaCheck = Process::timeout(5)->run('java -version 2>&1');
|
||||
if (! $javaCheck->successful()) {
|
||||
Log::warning('[EmulatorBuild] Java not found, attempting to install');
|
||||
Process::timeout(180)->run('apt-get update && apt-get install -y default-jdk 2>&1');
|
||||
}
|
||||
|
||||
$mavenCheck = Process::timeout(5)->run('which mvn');
|
||||
if (! $mavenCheck->successful()) {
|
||||
Log::warning('[EmulatorBuild] Maven not found, attempting to install');
|
||||
Process::timeout(180)->run('apt-get install -y maven 2>&1');
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,509 +0,0 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Services\Emulator;
|
||||
|
||||
use Illuminate\Support\Facades\Http;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Illuminate\Support\Facades\Process;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
class EmulatorJarService
|
||||
{
|
||||
use EmulatorConfiguration;
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->loadConfiguration();
|
||||
}
|
||||
|
||||
public function isConfigured(): bool
|
||||
{
|
||||
return ! in_array($this->githubUrl, [null, '', '0'], true) || ! in_array($this->jarDirectUrl, [null, '', '0'], true);
|
||||
}
|
||||
|
||||
public function checkForUpdates(): array
|
||||
{
|
||||
if (! $this->isConfigured()) {
|
||||
return [
|
||||
'update_available' => false,
|
||||
'error' => 'Configureer een GitHub URL of directe .jar URL',
|
||||
];
|
||||
}
|
||||
|
||||
$sourceService = new EmulatorSourceService;
|
||||
$sourceInfo = $sourceService->checkForUpdates();
|
||||
$hasSourceUpdates = $sourceInfo && $sourceInfo['has_update'];
|
||||
|
||||
if (! in_array($this->jarDirectUrl, [null, '', '0'], true)) {
|
||||
return $this->checkDirectUrlUpdates($sourceInfo, $hasSourceUpdates);
|
||||
}
|
||||
|
||||
return $this->checkGitHubFolderUpdates($sourceInfo, $hasSourceUpdates);
|
||||
}
|
||||
|
||||
public function performUpdate(array $check): array
|
||||
{
|
||||
$jarUrl = $check['jar_url'];
|
||||
$jarName = $check['jar_name'];
|
||||
$version = $check['latest_version'];
|
||||
$serviceName = $this->emulatorService;
|
||||
|
||||
$tempDir = '/tmp/emulator-update-' . Str::random(8);
|
||||
$tempJar = $tempDir . '/' . $jarName;
|
||||
|
||||
$updateScript = $this->buildUpdateScript($jarUrl, $jarName, $tempDir, $tempJar, $serviceName);
|
||||
|
||||
$scriptPath = '/tmp/emulator_update_' . uniqid() . '.sh';
|
||||
file_put_contents($scriptPath, $updateScript);
|
||||
chmod($scriptPath, 0755);
|
||||
|
||||
Log::info('[EmulatorJar] Starting update', [
|
||||
'version' => $version,
|
||||
'jar' => $jarName,
|
||||
'url' => $jarUrl,
|
||||
]);
|
||||
|
||||
try {
|
||||
$result = Process::timeout(600)->run('bash ' . $scriptPath . ' 2>&1');
|
||||
@unlink($scriptPath);
|
||||
|
||||
if ($result->exitCode() !== 0) {
|
||||
Log::error('[EmulatorJar] Update failed', [
|
||||
'output' => $result->output(),
|
||||
'error' => $result->errorOutput(),
|
||||
]);
|
||||
|
||||
return [
|
||||
'success' => false,
|
||||
'error' => 'Update mislukt: ' . substr($result->output(), 0, 300),
|
||||
];
|
||||
}
|
||||
|
||||
$this->storeUpdateInfo($version, $check);
|
||||
|
||||
Log::info('[EmulatorJar] Update successful');
|
||||
|
||||
return [
|
||||
'success' => true,
|
||||
'version' => $version,
|
||||
'jar' => $jarName,
|
||||
'message' => "✅ Emulator geüpdatet naar v{$version}!\n📦 {$jarName}\n🔄 Service herstart",
|
||||
];
|
||||
} catch (\Exception $e) {
|
||||
Log::error('[EmulatorJar] Exception', ['error' => $e->getMessage()]);
|
||||
|
||||
return [
|
||||
'success' => false,
|
||||
'error' => $e->getMessage(),
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
public function findLatestJar(): ?array
|
||||
{
|
||||
if (! $this->githubRepo) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$branch = $this->githubBranch ?: 'main';
|
||||
|
||||
$commonNames = ['arcturus.jar', 'Arcturus.jar', 'emulator.jar', 'habbo.jar', 'hotel.jar'];
|
||||
|
||||
foreach ($commonNames as $name) {
|
||||
try {
|
||||
$apiUrl = "https://api.github.com/repos/{$this->githubRepo}/contents/Latest_Compiled_Version/{$name}?ref={$branch}";
|
||||
$response = Http::timeout(10)
|
||||
->withHeaders([
|
||||
'Accept' => 'application/vnd.github.v3+json',
|
||||
'User-Agent' => 'AtomCMS-Emulator-Updater',
|
||||
])
|
||||
->get($apiUrl);
|
||||
|
||||
if (! $response->successful()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$data = json_decode($response->body(), true);
|
||||
|
||||
if (! isset($data['sha']) || ! isset($data['download_url'])) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$commitDate = null;
|
||||
$commitSha = $data['sha'];
|
||||
|
||||
try {
|
||||
$commitsResponse = Http::timeout(10)
|
||||
->withHeaders([
|
||||
'Accept' => 'application/vnd.github.v3+json',
|
||||
'User-Agent' => 'AtomCMS-Emulator-Updater',
|
||||
])
|
||||
->get("https://api.github.com/repos/{$this->githubRepo}/commits", [
|
||||
'path' => "Latest_Compiled_Version/{$name}",
|
||||
'sha' => $branch,
|
||||
'per_page' => 1,
|
||||
]);
|
||||
|
||||
if ($commitsResponse->successful()) {
|
||||
$commits = $commitsResponse->json();
|
||||
if (! empty($commits) && isset($commits[0]['commit']['committer']['date'])) {
|
||||
$commitDate = strtotime($commits[0]['commit']['committer']['date']);
|
||||
$commitSha = $commits[0]['sha'] ?? $data['sha'];
|
||||
}
|
||||
}
|
||||
} catch (\Exception) {
|
||||
Log::debug('[EmulatorJar] Could not fetch commit date for ' . $name);
|
||||
}
|
||||
|
||||
$installedDate = $this->settings->getOrDefault('emulator_jar_installed_date', null);
|
||||
$installedJarCommit = $this->settings->getOrDefault('emulator_jar_commit', null);
|
||||
|
||||
$isUpdate = false;
|
||||
if ($installedJarCommit !== null) {
|
||||
$isUpdate = $installedJarCommit !== $commitSha;
|
||||
} elseif ($installedDate !== null && $commitDate !== null) {
|
||||
$isUpdate = (int) $installedDate < $commitDate;
|
||||
} elseif ($installedDate === null && $commitDate !== null) {
|
||||
$isUpdate = true;
|
||||
}
|
||||
|
||||
$version = $this->extractVersionFromFilename($name);
|
||||
if ($version === '' || $version === '0') {
|
||||
$version = $commitDate ? date('Y.m.d', $commitDate) : date('Y.m.d');
|
||||
}
|
||||
|
||||
return [
|
||||
'name' => $name,
|
||||
'url' => $data['download_url'],
|
||||
'version' => $version,
|
||||
'commit' => $commitSha,
|
||||
'commit_date' => $commitDate,
|
||||
'is_update' => $isUpdate,
|
||||
'installed_date' => $installedDate,
|
||||
];
|
||||
} catch (\Exception $e) {
|
||||
Log::warning('[EmulatorJar] Error checking JAR file ' . $name, ['error' => $e->getMessage()]);
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private function checkDirectUrlUpdates(?array $sourceInfo, bool $hasSourceUpdates): array
|
||||
{
|
||||
$jarInfo = $this->validateDirectUrl($this->jarDirectUrl);
|
||||
|
||||
if ($jarInfo) {
|
||||
if (! empty($jarInfo['version'])) {
|
||||
$currentVersion = $this->settings->getOrDefault('emulator_version', '0.0.0');
|
||||
if ($jarInfo['version'] !== $currentVersion) {
|
||||
$this->settings->set('emulator_version', $jarInfo['version']);
|
||||
}
|
||||
}
|
||||
|
||||
$hasJarUpdates = $jarInfo['is_update'] ?? false;
|
||||
|
||||
if ($hasSourceUpdates && ! $hasJarUpdates) {
|
||||
return [
|
||||
'update_available' => true,
|
||||
'current_version' => $this->settings->getOrDefault('emulator_version', '0.0.0'),
|
||||
'latest_version' => $sourceInfo['latest_timestamp'] ? date('Y.m.d', $sourceInfo['latest_timestamp']) : $jarInfo['version'],
|
||||
'release_name' => 'Source Update',
|
||||
'jar_url' => null,
|
||||
'jar_name' => null,
|
||||
'jar_size' => 'Onbekend',
|
||||
'type' => 'source_build',
|
||||
'source_info' => $sourceInfo,
|
||||
'message' => 'Nieuwe commits beschikbaar - build vanaf source nodig',
|
||||
];
|
||||
}
|
||||
|
||||
return [
|
||||
'update_available' => $hasJarUpdates,
|
||||
'current_version' => $this->settings->getOrDefault('emulator_version', '0.0.0'),
|
||||
'latest_version' => $jarInfo['version'],
|
||||
'release_name' => $hasSourceUpdates ? 'Source Update' : 'Direct URL',
|
||||
'jar_url' => $this->jarDirectUrl,
|
||||
'jar_name' => $jarInfo['name'],
|
||||
'jar_size' => 'Onbekend',
|
||||
'type' => $hasSourceUpdates ? 'source_build' : 'direct_url',
|
||||
'commit' => $jarInfo['commit_sha'] ?? null,
|
||||
'source_info' => $sourceInfo,
|
||||
'has_source_updates' => $hasSourceUpdates,
|
||||
];
|
||||
}
|
||||
|
||||
if ($hasSourceUpdates) {
|
||||
return [
|
||||
'update_available' => true,
|
||||
'current_version' => $this->settings->getOrDefault('emulator_version', '0.0.0'),
|
||||
'latest_version' => $sourceInfo['latest_timestamp'] ? date('Y.m.d', $sourceInfo['latest_timestamp']) : 'Onbekend',
|
||||
'release_name' => 'Source Update',
|
||||
'jar_url' => null,
|
||||
'jar_name' => null,
|
||||
'jar_size' => 'Onbekend',
|
||||
'type' => 'source_build',
|
||||
'source_info' => $sourceInfo,
|
||||
'message' => 'Nieuwe commits beschikbaar - build vanaf source nodig',
|
||||
];
|
||||
}
|
||||
|
||||
return [
|
||||
'update_available' => false,
|
||||
'current_version' => $this->settings->getOrDefault('emulator_version', '0.0.0'),
|
||||
'error' => 'Directe .jar URL is niet bereikbaar',
|
||||
];
|
||||
}
|
||||
|
||||
private function checkGitHubFolderUpdates(?array $sourceInfo, bool $hasSourceUpdates): array
|
||||
{
|
||||
$jarInfo = $this->findLatestJar();
|
||||
|
||||
if (! $jarInfo) {
|
||||
if ($hasSourceUpdates) {
|
||||
return [
|
||||
'update_available' => true,
|
||||
'current_version' => $this->settings->getOrDefault('emulator_version', '0.0.0'),
|
||||
'latest_version' => $sourceInfo['latest_timestamp'] ? date('Y.m.d', $sourceInfo['latest_timestamp']) : 'Onbekend',
|
||||
'release_name' => 'Source Update',
|
||||
'jar_url' => null,
|
||||
'jar_name' => null,
|
||||
'jar_size' => 'Onbekend',
|
||||
'type' => 'source_build',
|
||||
'source_info' => $sourceInfo,
|
||||
'message' => 'Nieuwe commits beschikbaar - build vanaf source nodig',
|
||||
];
|
||||
}
|
||||
|
||||
return [
|
||||
'update_available' => false,
|
||||
'current_version' => $this->settings->getOrDefault('emulator_version', '0.0.0'),
|
||||
'latest_version' => 'Onbekend',
|
||||
'error' => 'Kon geen .jar bestand vinden',
|
||||
'type' => 'not_found',
|
||||
'source_available' => $sourceInfo !== null,
|
||||
];
|
||||
}
|
||||
|
||||
$version = $jarInfo['version'];
|
||||
$hasJarUpdates = $jarInfo['is_update'] ?? false;
|
||||
|
||||
if ($hasSourceUpdates && ! $hasJarUpdates) {
|
||||
return [
|
||||
'update_available' => true,
|
||||
'current_version' => $this->settings->getOrDefault('emulator_version', '0.0.0'),
|
||||
'latest_version' => $sourceInfo['latest_timestamp'] ? date('Y.m.d', $sourceInfo['latest_timestamp']) : $version,
|
||||
'release_name' => 'Source Update',
|
||||
'jar_url' => null,
|
||||
'jar_name' => null,
|
||||
'jar_size' => 'Onbekend',
|
||||
'type' => 'source_build',
|
||||
'source_info' => $sourceInfo,
|
||||
'message' => 'Nieuwe commits beschikbaar - build vanaf source nodig',
|
||||
];
|
||||
}
|
||||
|
||||
return [
|
||||
'update_available' => $hasJarUpdates,
|
||||
'current_version' => $this->settings->getOrDefault('emulator_version', '0.0.0'),
|
||||
'latest_version' => $hasSourceUpdates ? ($sourceInfo['latest_timestamp'] ? date('Y.m.d', $sourceInfo['latest_timestamp']) : $version) : $version,
|
||||
'release_name' => $hasSourceUpdates ? 'Source Update' : 'Latest from GitHub',
|
||||
'jar_url' => $jarInfo['url'],
|
||||
'jar_name' => $jarInfo['name'],
|
||||
'jar_size' => 'Onbekend',
|
||||
'type' => $hasSourceUpdates ? 'source_build' : 'github_folder',
|
||||
'commit' => $jarInfo['commit'] ?? null,
|
||||
'commit_date' => $jarInfo['commit_date'] ?? null,
|
||||
'source_info' => $sourceInfo,
|
||||
'has_source_updates' => $hasSourceUpdates,
|
||||
];
|
||||
}
|
||||
|
||||
private function validateDirectUrl(string $url): ?array
|
||||
{
|
||||
if ($url === '' || $url === '0' || ! str_ends_with(strtolower($url), '.jar')) {
|
||||
return null;
|
||||
}
|
||||
|
||||
try {
|
||||
$jarName = basename(parse_url($url, PHP_URL_PATH));
|
||||
$version = $this->extractVersionFromFilename($jarName);
|
||||
$storedVersion = $this->settings->getOrDefault('emulator_version', '0.0.0');
|
||||
|
||||
$lastModified = null;
|
||||
$commitSha = null;
|
||||
$gitHubInfoAvailable = false;
|
||||
|
||||
if (preg_match('/github\.com\/([^\/]+)\/([^\/]+)\/raw\/refs\/heads\/([^\/]+)\/(.+)/', $url, $matches)) {
|
||||
$owner = $matches[1];
|
||||
$repo = $matches[2];
|
||||
$branch = $matches[3];
|
||||
$path = $matches[4];
|
||||
|
||||
try {
|
||||
$apiResponse = Http::timeout(10)
|
||||
->withHeaders([
|
||||
'Accept' => 'application/vnd.github.v3+json',
|
||||
'User-Agent' => 'AtomCMS-Emulator-Updater',
|
||||
])
|
||||
->get("https://api.github.com/repos/{$owner}/{$repo}/contents/{$path}", [
|
||||
'ref' => $branch,
|
||||
]);
|
||||
|
||||
if ($apiResponse->successful()) {
|
||||
$data = $apiResponse->json();
|
||||
|
||||
if (isset($data['sha']) && ! isset($data['message'])) {
|
||||
$gitHubInfoAvailable = true;
|
||||
$commitSha = $data['sha'];
|
||||
|
||||
if (isset($data['commit']['committer']['date'])) {
|
||||
$lastModified = strtotime($data['commit']['committer']['date']);
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (\Exception) {
|
||||
Log::debug('[EmulatorJar] Could not fetch GitHub commit info for direct URL');
|
||||
}
|
||||
}
|
||||
|
||||
if ($lastModified === null) {
|
||||
$response = Http::timeout(10)->head($url);
|
||||
if ($response->successful()) {
|
||||
$modifiedSince = $response->header('Last-Modified');
|
||||
if ($modifiedSince) {
|
||||
$lastModified = strtotime($modifiedSince);
|
||||
if ($lastModified === false) {
|
||||
$lastModified = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$isUpdate = false;
|
||||
$installedDate = $this->settings->getOrDefault('emulator_jar_installed_date', null);
|
||||
|
||||
$storedData = $this->settings->getOrDefault('emulator_direct_url_info_' . md5($url));
|
||||
if ($storedData !== null && is_string($storedData)) {
|
||||
$storedDataArray = json_decode($storedData, true);
|
||||
if (is_array($storedDataArray)) {
|
||||
if ($gitHubInfoAvailable && $commitSha !== null && isset($storedDataArray['commit_sha'])) {
|
||||
$isUpdate = $commitSha !== $storedDataArray['commit_sha'];
|
||||
} elseif ($lastModified !== null && $installedDate !== null) {
|
||||
$isUpdate = (int) $installedDate < $lastModified;
|
||||
} elseif ($lastModified !== null && isset($storedDataArray['last_modified'])) {
|
||||
$isUpdate = $lastModified > $storedDataArray['last_modified'];
|
||||
} elseif (! in_array($version, ['', '0', $storedVersion], true)) {
|
||||
$isUpdate = version_compare($version, $storedVersion) > 0;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$isUpdate = true;
|
||||
}
|
||||
|
||||
$infoToStore = [
|
||||
'last_checked' => time(),
|
||||
'version' => $version,
|
||||
];
|
||||
if ($lastModified) {
|
||||
$infoToStore['last_modified'] = $lastModified;
|
||||
}
|
||||
if ($commitSha) {
|
||||
$infoToStore['commit_sha'] = $commitSha;
|
||||
}
|
||||
$this->settings->set('emulator_direct_url_info_' . md5($url), json_encode($infoToStore));
|
||||
|
||||
return [
|
||||
'name' => $jarName,
|
||||
'version' => $version,
|
||||
'last_modified' => $lastModified,
|
||||
'commit_sha' => $commitSha,
|
||||
'is_update' => $isUpdate,
|
||||
'gitHub_rate_limited' => ! $gitHubInfoAvailable && preg_match('/github\.com/', $url),
|
||||
];
|
||||
} catch (\Exception $e) {
|
||||
Log::warning('[EmulatorJar] Direct URL not reachable', ['error' => $e->getMessage()]);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private function buildUpdateScript(string $jarUrl, string $jarName, string $tempDir, string $tempJar, string $serviceName): string
|
||||
{
|
||||
return <<<BASH
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
JAR_URL='{$jarUrl}'
|
||||
JAR_NAME='{$jarName}'
|
||||
JAR_PATH='{$this->jarPath}'
|
||||
SERVICE='{$serviceName}'
|
||||
TEMP_DIR='{$tempDir}'
|
||||
TEMP_JAR='{$tempJar}'
|
||||
|
||||
mkdir -p "\$TEMP_DIR" "\$JAR_PATH"
|
||||
|
||||
if ls "\$JAR_PATH"/*.jar 1>/dev/null 2>&1; then
|
||||
mkdir -p "\$JAR_PATH/backup"
|
||||
mv "\$JAR_PATH"/*.jar "\$JAR_PATH/backup/" 2>/dev/null || true
|
||||
fi
|
||||
|
||||
download_success=false
|
||||
for attempt in 1 2 3; do
|
||||
if curl -L --max-time 300 --retry 3 --retry-delay 5 -o "\$TEMP_JAR" "\$JAR_URL" 2>&1; then
|
||||
FILE_TYPE=\$(file -b "\$TEMP_JAR" 2>/dev/null)
|
||||
JAR_SIZE=\$(stat -c%s "\$TEMP_JAR" 2>/dev/null || echo 0)
|
||||
|
||||
if echo "\$FILE_TYPE" | grep -qi "zip\|jar\|archive" && [ "\$JAR_SIZE" -gt 1000 ]; then
|
||||
download_success=true
|
||||
break
|
||||
else
|
||||
rm -f "\$TEMP_JAR" 2>/dev/null || true
|
||||
sleep 3
|
||||
fi
|
||||
else
|
||||
sleep 5
|
||||
fi
|
||||
done
|
||||
|
||||
if [ "\$download_success" = false ]; then
|
||||
if ls "\$JAR_PATH/backup"/*.jar 1>/dev/null 2>&1; then
|
||||
mv "\$JAR_PATH/backup"/*.jar "\$JAR_PATH/" 2>/dev/null || true
|
||||
fi
|
||||
rm -rf "\$TEMP_DIR"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
mv "\$TEMP_JAR" "\$JAR_PATH/"
|
||||
chown -R www-data:www-data "\$JAR_PATH"
|
||||
chmod 755 "\$JAR_PATH/\$JAR_NAME"
|
||||
|
||||
systemctl restart "\$SERVICE" 2>&1 || service "\$SERVICE" restart 2>&1 || true
|
||||
|
||||
rm -rf "\$TEMP_DIR" 2>/dev/null || true
|
||||
BASH;
|
||||
}
|
||||
|
||||
private function storeUpdateInfo(string $version, array $check): void
|
||||
{
|
||||
setting('emulator_version', $version);
|
||||
|
||||
$commitDate = $check['commit_date'] ?? time();
|
||||
$this->settings->set('emulator_jar_installed_date', (string) $commitDate);
|
||||
$this->settings->set('emulator_jar_commit', $check['commit'] ?? null);
|
||||
|
||||
$sourceSha = $check['source_info']['latest_sha'] ?? $check['commit'] ?? null;
|
||||
$sourceDate = $check['source_info']['latest_timestamp'] ?? ($check['commit_date'] ?? time());
|
||||
if ($sourceSha) {
|
||||
$this->settings->set('emulator_source_commit', $sourceSha);
|
||||
}
|
||||
if ($sourceDate) {
|
||||
$this->settings->set('emulator_source_date', (string) $sourceDate);
|
||||
}
|
||||
|
||||
$currentBranch = $this->sourceBranch ?: $this->githubBranch ?: 'main';
|
||||
$this->settings->set('emulator_installed_branch', $currentBranch);
|
||||
}
|
||||
}
|
||||
@@ -1,273 +0,0 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Services\Emulator;
|
||||
|
||||
use Illuminate\Support\Facades\Http;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Illuminate\Support\Facades\Process;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
class EmulatorSourceService
|
||||
{
|
||||
use EmulatorConfiguration;
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->loadConfiguration();
|
||||
}
|
||||
|
||||
public function checkForUpdates(): ?array
|
||||
{
|
||||
$repo = $this->sourceRepo ?: $this->githubRepo;
|
||||
$branch = $this->sourceBranch ?: $this->githubBranch ?: 'main';
|
||||
|
||||
if (! $repo) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$localCheck = $this->checkLocalSourceUpdates();
|
||||
if ($localCheck !== null) {
|
||||
return $localCheck;
|
||||
}
|
||||
|
||||
return $this->checkRemoteSourceUpdates($repo, $branch);
|
||||
}
|
||||
|
||||
public function isSourceBuildAvailable(): bool
|
||||
{
|
||||
$hasRepo = ! in_array($this->sourceRepo, [null, '', '0'], true) || ! in_array($this->githubRepo, [null, '', '0'], true);
|
||||
$hasPath = ! in_array($this->emulatorSourcePath, [null, '', '0'], true);
|
||||
|
||||
if (! $hasRepo || ! $hasPath) {
|
||||
return false;
|
||||
}
|
||||
|
||||
try {
|
||||
$result = Process::timeout(5)->run("[ -d {$this->emulatorSourcePath} ] && echo 'exists' || echo 'not_exists'");
|
||||
|
||||
return trim($result->output()) === 'exists';
|
||||
} catch (\Exception) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
private function checkLocalSourceUpdates(): ?array
|
||||
{
|
||||
$sourcePath = $this->emulatorSourcePath;
|
||||
|
||||
$existsCheck = Process::timeout(5)->run("[ -d {$sourcePath} ] && echo 'exists'");
|
||||
if (! $existsCheck->successful() || trim($existsCheck->output()) !== 'exists') {
|
||||
return $this->checkSourceByCloning();
|
||||
}
|
||||
|
||||
try {
|
||||
$gitCheck = Process::timeout(5)->run("cd {$sourcePath} && git rev-parse --is-inside-work-tree 2>/dev/null");
|
||||
if (! $gitCheck->successful()) {
|
||||
return $this->checkSourceByCloning();
|
||||
}
|
||||
|
||||
$currentCommitResult = Process::timeout(5)->run("cd {$sourcePath} && git rev-parse HEAD");
|
||||
if (! $currentCommitResult->successful()) {
|
||||
return null;
|
||||
}
|
||||
$currentSha = trim($currentCommitResult->output());
|
||||
|
||||
$fetchResult = Process::timeout(30)->run("cd {$sourcePath} && git fetch origin 2>&1");
|
||||
if ($fetchResult->failed()) {
|
||||
Log::debug('[EmulatorSource] Git fetch failed, trying local check only');
|
||||
}
|
||||
|
||||
$branch = $this->sourceBranch ?: $this->githubBranch ?: 'main';
|
||||
$latestResult = Process::timeout(5)->run("cd {$sourcePath} && git rev-parse origin/{$branch} 2>/dev/null || git rev-parse HEAD");
|
||||
if (! $latestResult->successful()) {
|
||||
return null;
|
||||
}
|
||||
$latestSha = trim($latestResult->output());
|
||||
|
||||
$dateResult = Process::timeout(5)->run("cd {$sourcePath} && git log -1 --format='%ci' {$latestSha}");
|
||||
$latestDate = null;
|
||||
$latestTimestamp = time();
|
||||
if ($dateResult->successful()) {
|
||||
$latestDate = trim($dateResult->output(), "'");
|
||||
if ($latestDate !== '' && $latestDate !== '0') {
|
||||
$latestTimestamp = strtotime($latestDate);
|
||||
}
|
||||
}
|
||||
|
||||
$this->persistSourceCommitInfo($latestSha, $latestTimestamp);
|
||||
|
||||
$msgResult = Process::timeout(5)->run("cd {$sourcePath} && git log -1 --format='%s' {$latestSha}");
|
||||
$latestMessage = $msgResult->successful() ? trim($msgResult->output()) : '';
|
||||
|
||||
$authorResult = Process::timeout(5)->run("cd {$sourcePath} && git log -1 --format='%an' {$latestSha}");
|
||||
$latestAuthor = $authorResult->successful() ? trim($authorResult->output()) : '';
|
||||
|
||||
$storedSha = $this->settings->getOrDefault('emulator_source_commit', null);
|
||||
$storedDate = $this->settings->getOrDefault('emulator_source_date', null);
|
||||
|
||||
$isUpdate = $storedSha !== null && $storedSha !== $latestSha;
|
||||
if ($storedSha === null) {
|
||||
$isUpdate = true;
|
||||
}
|
||||
|
||||
return [
|
||||
'has_update' => $isUpdate,
|
||||
'latest_sha' => $latestSha,
|
||||
'latest_date' => $latestDate,
|
||||
'latest_timestamp' => $latestTimestamp,
|
||||
'latest_message' => $latestMessage,
|
||||
'latest_author' => $latestAuthor,
|
||||
'stored_sha' => $storedSha,
|
||||
'stored_date' => $storedDate,
|
||||
'source' => 'local',
|
||||
];
|
||||
} catch (\Exception $e) {
|
||||
Log::debug('[EmulatorSource] Local source check failed: ' . $e->getMessage());
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private function checkSourceByCloning(): ?array
|
||||
{
|
||||
$repo = $this->sourceRepo ?: $this->githubRepo;
|
||||
$branch = $this->sourceBranch ?: $this->githubBranch ?: 'main';
|
||||
|
||||
if (! $repo) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$repo = preg_replace('#/tree/[^/]+/.*$#', '', $repo);
|
||||
$repo = str_replace(['https://github.com/', 'http://github.com/'], '', $repo);
|
||||
$repo = rtrim($repo, '/');
|
||||
|
||||
try {
|
||||
$tempDir = '/tmp/emulator-source-check-' . Str::random(8);
|
||||
|
||||
$cloneResult = Process::timeout(120)->run(
|
||||
"git clone --branch {$branch} --depth 1 https://github.com/{$repo}.git {$tempDir} 2>&1",
|
||||
);
|
||||
|
||||
if ($cloneResult->failed()) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$shaResult = Process::timeout(5)->run("cd {$tempDir} && git rev-parse HEAD");
|
||||
$latestSha = $shaResult->successful() ? trim($shaResult->output()) : '';
|
||||
|
||||
$dateResult = Process::timeout(5)->run("cd {$tempDir} && git log -1 --format='%ci'");
|
||||
$latestDate = null;
|
||||
$latestTimestamp = time();
|
||||
if ($dateResult->successful()) {
|
||||
$latestDate = trim($dateResult->output());
|
||||
if ($latestDate !== '' && $latestDate !== '0') {
|
||||
$latestTimestamp = strtotime($latestDate);
|
||||
}
|
||||
}
|
||||
|
||||
$this->persistSourceCommitInfo($latestSha, $latestTimestamp);
|
||||
|
||||
$msgResult = Process::timeout(5)->run("cd {$tempDir} && git log -1 --format='%s'");
|
||||
$latestMessage = $msgResult->successful() ? trim($msgResult->output()) : '';
|
||||
|
||||
$authorResult = Process::timeout(5)->run("cd {$tempDir} && git log -1 --format='%an'");
|
||||
$latestAuthor = $authorResult->successful() ? trim($authorResult->output()) : '';
|
||||
|
||||
Process::timeout(10)->run("rm -rf {$tempDir}");
|
||||
|
||||
$storedSha = $this->settings->getOrDefault('emulator_source_commit', null);
|
||||
$storedDate = $this->settings->getOrDefault('emulator_source_date', null);
|
||||
|
||||
$isUpdate = $storedSha !== null && $storedSha !== $latestSha;
|
||||
if ($storedSha === null) {
|
||||
$isUpdate = true;
|
||||
}
|
||||
|
||||
return [
|
||||
'has_update' => $isUpdate,
|
||||
'latest_sha' => $latestSha,
|
||||
'latest_date' => $latestDate,
|
||||
'latest_timestamp' => $latestTimestamp,
|
||||
'latest_message' => $latestMessage,
|
||||
'latest_author' => $latestAuthor,
|
||||
'stored_sha' => $storedSha,
|
||||
'stored_date' => $storedDate,
|
||||
'source' => 'cloned',
|
||||
];
|
||||
} catch (\Exception $e) {
|
||||
Log::debug('[EmulatorSource] Source clone check failed: ' . $e->getMessage());
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private function checkRemoteSourceUpdates(string $repo, string $branch): ?array
|
||||
{
|
||||
try {
|
||||
$response = Http::timeout(10)
|
||||
->withHeaders([
|
||||
'Accept' => 'application/vnd.github.v3+json',
|
||||
'User-Agent' => 'AtomCMS-Emulator-Updater',
|
||||
])
|
||||
->get("https://api.github.com/repos/{$repo}/commits", [
|
||||
'sha' => $branch,
|
||||
'per_page' => 1,
|
||||
]);
|
||||
|
||||
if (! $response->successful()) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$commits = $response->json();
|
||||
|
||||
if (empty($commits) || ! isset($commits[0]['sha'])) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$latestCommit = $commits[0];
|
||||
$latestSha = $latestCommit['sha'];
|
||||
$latestDate = $latestCommit['commit']['committer']['date'] ?? null;
|
||||
$latestTimestamp = $latestDate ? strtotime((string) $latestDate) : time();
|
||||
|
||||
$this->persistSourceCommitInfo($latestSha, $latestTimestamp);
|
||||
|
||||
$installedDate = $this->settings->getOrDefault('emulator_jar_installed_date', null);
|
||||
$storedSha = $this->settings->getOrDefault('emulator_source_commit', null);
|
||||
$storedDate = $this->settings->getOrDefault('emulator_source_date', null);
|
||||
|
||||
if ($storedSha !== null && $storedSha === $latestSha) {
|
||||
$isUpdate = false;
|
||||
} elseif ($storedSha !== null && $storedSha !== $latestSha) {
|
||||
$isUpdate = true;
|
||||
} elseif ($installedDate !== null) {
|
||||
$installedTimestamp = is_numeric($installedDate) ? (int) $installedDate : strtotime((string) $installedDate);
|
||||
$isUpdate = $installedTimestamp < $latestTimestamp;
|
||||
} else {
|
||||
$isUpdate = false;
|
||||
}
|
||||
|
||||
return [
|
||||
'has_update' => $isUpdate,
|
||||
'latest_sha' => $latestSha,
|
||||
'latest_date' => $latestDate,
|
||||
'latest_timestamp' => $latestTimestamp,
|
||||
'latest_message' => $latestCommit['commit']['message'] ?? '',
|
||||
'latest_author' => $latestCommit['commit']['author']['name'] ?? '',
|
||||
'stored_sha' => $storedSha,
|
||||
'stored_date' => $storedDate,
|
||||
];
|
||||
} catch (\Exception $e) {
|
||||
Log::warning('[EmulatorSource] Could not check source updates via GitHub API', ['error' => $e->getMessage()]);
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private function persistSourceCommitInfo(string $sha, int $timestamp): void
|
||||
{
|
||||
$this->settings->set('emulator_source_commit', $sha);
|
||||
$this->settings->set('emulator_source_date', (string) $timestamp);
|
||||
}
|
||||
}
|
||||
@@ -1,510 +0,0 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Services\Emulator;
|
||||
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Http;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
class EmulatorSqlService
|
||||
{
|
||||
use EmulatorConfiguration;
|
||||
|
||||
private const string SQL_TABLE = 'emulator_sql_updates';
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->loadConfiguration();
|
||||
}
|
||||
|
||||
public function isConfigured(): bool
|
||||
{
|
||||
return ! in_array($this->githubUrl, [null, '', '0'], true) || ! in_array($this->jarDirectUrl, [null, '', '0'], true);
|
||||
}
|
||||
|
||||
public function checkForUpdates(bool $recentOnly = true): array
|
||||
{
|
||||
if (! $this->githubRepo) {
|
||||
return [
|
||||
'has_updates' => false,
|
||||
'error' => 'Geen GitHub repo geconfigureerd',
|
||||
];
|
||||
}
|
||||
|
||||
$this->ensureSqlTableExists();
|
||||
|
||||
$result = $this->fetchSqlFilesFromGitHub($recentOnly);
|
||||
|
||||
if (isset($result['error'])) {
|
||||
return [
|
||||
'has_updates' => false,
|
||||
'error' => $result['error'],
|
||||
];
|
||||
}
|
||||
|
||||
$sqlFiles = $result;
|
||||
|
||||
if ($sqlFiles === []) {
|
||||
return [
|
||||
'has_updates' => false,
|
||||
'message' => $recentOnly
|
||||
? 'Geen SQL updates van de afgelopen week gevonden'
|
||||
: 'Geen SQL updates gevonden',
|
||||
];
|
||||
}
|
||||
|
||||
$appliedHashes = $this->getAppliedSqlHashes();
|
||||
$newSqlFiles = [];
|
||||
$alreadyApplied = [];
|
||||
|
||||
foreach ($sqlFiles as $file) {
|
||||
$hash = $file['sha'] ?? md5((string) $file['name']);
|
||||
if (in_array($hash, $appliedHashes)) {
|
||||
$alreadyApplied[] = $file['name'];
|
||||
|
||||
continue;
|
||||
}
|
||||
$newSqlFiles[] = $file;
|
||||
}
|
||||
|
||||
if ($newSqlFiles === []) {
|
||||
return [
|
||||
'has_updates' => false,
|
||||
'message' => 'Alle SQL updates zijn al toegepast (' . count($alreadyApplied) . ' stuks)',
|
||||
'applied_count' => count($alreadyApplied),
|
||||
];
|
||||
}
|
||||
|
||||
usort($newSqlFiles, fn ($a, $b) => strcmp((string) $a['name'], (string) $b['name']));
|
||||
|
||||
return [
|
||||
'has_updates' => true,
|
||||
'count' => count($newSqlFiles),
|
||||
'files' => $newSqlFiles,
|
||||
'message' => count($newSqlFiles) . ' nieuwe SQL update(s) van deze week',
|
||||
'applied_count' => count($alreadyApplied),
|
||||
];
|
||||
}
|
||||
|
||||
public function runUpdates(): array
|
||||
{
|
||||
$sqlCheck = $this->checkForUpdates(false);
|
||||
|
||||
if (! ($sqlCheck['has_updates'] ?? false)) {
|
||||
return ['success' => true, 'sql_updated' => false, 'message' => 'Geen nieuwe SQL updates'];
|
||||
}
|
||||
|
||||
$results = [
|
||||
'success' => true,
|
||||
'sql_updated' => true,
|
||||
'files_run' => [],
|
||||
'errors' => [],
|
||||
];
|
||||
|
||||
foreach ($sqlCheck['files'] as $file) {
|
||||
$sqlResult = $this->downloadAndRunSql($file);
|
||||
|
||||
if ($sqlResult['success']) {
|
||||
$results['files_run'][] = $file['name'];
|
||||
$this->markSqlAsApplied($file);
|
||||
} else {
|
||||
$results['errors'][] = $file['name'] . ': ' . $sqlResult['error'];
|
||||
}
|
||||
}
|
||||
|
||||
if (count($results['errors']) > 0) {
|
||||
$results['message'] = count($results['files_run']) . ' SQL updates succesvol, ' . count($results['errors']) . ' met fouten';
|
||||
} else {
|
||||
$results['message'] = count($results['files_run']) . ' SQL updates succesvol uitgevoerd!';
|
||||
}
|
||||
|
||||
return $results;
|
||||
}
|
||||
|
||||
public function getAppliedUpdates(): array
|
||||
{
|
||||
$this->ensureSqlTableExists();
|
||||
|
||||
return DB::table(self::SQL_TABLE)
|
||||
->orderBy('applied_at', 'desc')
|
||||
->get()
|
||||
->toArray();
|
||||
}
|
||||
|
||||
public function diagnose(): array
|
||||
{
|
||||
$diagnosis = [
|
||||
'table_exists' => false,
|
||||
'applied_count' => 0,
|
||||
'pending_count' => 0,
|
||||
'error' => null,
|
||||
];
|
||||
|
||||
try {
|
||||
$diagnosis['table_exists'] = Schema::hasTable(self::SQL_TABLE);
|
||||
|
||||
if ($diagnosis['table_exists']) {
|
||||
$diagnosis['applied_count'] = DB::table(self::SQL_TABLE)->count();
|
||||
}
|
||||
|
||||
if ($this->githubRepo && $diagnosis['table_exists']) {
|
||||
$sqlCheck = $this->checkForUpdates(false);
|
||||
if (isset($sqlCheck['count'])) {
|
||||
$diagnosis['pending_count'] = $sqlCheck['count'];
|
||||
}
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
$diagnosis['error'] = $e->getMessage();
|
||||
}
|
||||
|
||||
return $diagnosis;
|
||||
}
|
||||
|
||||
public function repair(): array
|
||||
{
|
||||
$actions = [];
|
||||
$errors = [];
|
||||
|
||||
try {
|
||||
$this->ensureSqlTableExists();
|
||||
$actions[] = 'SQL update tabel gecontroleerd';
|
||||
|
||||
$appliedCount = DB::table(self::SQL_TABLE)->count();
|
||||
$actions[] = "SQL updates tabel OK ({$appliedCount} records)";
|
||||
|
||||
if ($this->githubRepo) {
|
||||
$sqlCheck = $this->checkForUpdates(false);
|
||||
|
||||
if (isset($sqlCheck['error'])) {
|
||||
$actions[] = 'SQL update check: ' . $sqlCheck['error'];
|
||||
} elseif (! ($sqlCheck['has_updates'] ?? false)) {
|
||||
$actions[] = 'SQL updates: ' . ($sqlCheck['message'] ?? 'Allemaal up-to-date');
|
||||
} else {
|
||||
$count = $sqlCheck['count'] ?? 0;
|
||||
$actions[] = "{$count} nieuwe SQL updates beschikbaar";
|
||||
|
||||
if ($this->isConfigured()) {
|
||||
$actions[] = 'SQL updates worden toegepast...';
|
||||
$runResult = $this->runUpdates();
|
||||
|
||||
if ($runResult['success'] ?? false) {
|
||||
$filesRun = count($runResult['files_run'] ?? []);
|
||||
$actions[] = "{$filesRun} SQL updates toegepast";
|
||||
} else {
|
||||
$errors[] = 'SQL updates: ' . ($runResult['error'] ?? 'Onbekende fout');
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
$errors[] = 'SQL repair: ' . $e->getMessage();
|
||||
Log::error('[EmulatorSql] Repair failed', ['error' => $e->getMessage()]);
|
||||
}
|
||||
|
||||
return [
|
||||
'success' => $errors === [],
|
||||
'actions' => $actions,
|
||||
'errors' => $errors,
|
||||
];
|
||||
}
|
||||
|
||||
private function ensureSqlTableExists(): void
|
||||
{
|
||||
if (Schema::hasTable(self::SQL_TABLE)) {
|
||||
return;
|
||||
}
|
||||
|
||||
Schema::create(self::SQL_TABLE, function ($table) {
|
||||
$table->id();
|
||||
$table->string('file_name');
|
||||
$table->string('file_hash')->unique();
|
||||
$table->timestamp('applied_at');
|
||||
$table->text('sql_content')->nullable();
|
||||
});
|
||||
}
|
||||
|
||||
private function getAppliedSqlHashes(): array
|
||||
{
|
||||
$this->ensureSqlTableExists();
|
||||
|
||||
return DB::table(self::SQL_TABLE)
|
||||
->pluck('file_hash')
|
||||
->toArray();
|
||||
}
|
||||
|
||||
private function markSqlAsApplied(array $file): void
|
||||
{
|
||||
$this->ensureSqlTableExists();
|
||||
|
||||
$hash = $file['sha'] ?? md5((string) $file['name']);
|
||||
|
||||
DB::table(self::SQL_TABLE)->updateOrInsert(
|
||||
['file_hash' => $hash],
|
||||
[
|
||||
'file_name' => $file['name'],
|
||||
'applied_at' => now(),
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
private function fetchSqlFilesFromGitHub(bool $recentOnly = false): array
|
||||
{
|
||||
if (! $this->githubRepo) {
|
||||
return [];
|
||||
}
|
||||
|
||||
$branch = $this->githubBranch ?: 'main';
|
||||
|
||||
$folderNames = [
|
||||
'Database%20Updates',
|
||||
'Database Updates',
|
||||
'database_updates',
|
||||
'database/updates',
|
||||
'sql/updates',
|
||||
'sql',
|
||||
'updates',
|
||||
];
|
||||
|
||||
$knownSqlFiles = [
|
||||
'07012026_UpdateDatabase_to_4-0-1.sql',
|
||||
'09012026_UpdateDatabase_to_4-0-2.sql',
|
||||
'12012026_Battle Banzai.sql',
|
||||
'12012026_Breeding Fixes.sql',
|
||||
'12012026_ChatBubbles.sql',
|
||||
'16032026_updateall_command.sql',
|
||||
'17032026_allow_underpass.sql',
|
||||
'19032026_hotel_timezone.sql',
|
||||
'21022026_user_prefixes.sql',
|
||||
'Default_Camera.sql',
|
||||
'UpdateDatabase_Allow_diagonale.sql',
|
||||
'UpdateDatabase_BOT.sql',
|
||||
'UpdateDatabase_Banners.sql',
|
||||
'UpdateDatabase_DanceCMD.sql',
|
||||
'UpdateDatabase_Happiness.sql',
|
||||
'UpdateDatabase_Websocket.sql',
|
||||
'UpdateDatabase_unignorable.sql',
|
||||
];
|
||||
|
||||
try {
|
||||
if ($recentOnly) {
|
||||
return $this->fetchRecentSqlFiles($branch);
|
||||
}
|
||||
|
||||
$sqlFiles = [];
|
||||
|
||||
foreach ($knownSqlFiles as $filename) {
|
||||
foreach ($folderNames as $folderName) {
|
||||
$encodedFilename = str_replace(' ', '%20', $filename);
|
||||
$url = "https://raw.githubusercontent.com/{$this->githubRepo}/{$branch}/{$folderName}/{$encodedFilename}";
|
||||
$response = Http::timeout(10)->get($url);
|
||||
|
||||
if ($response->successful()) {
|
||||
$sqlFiles[] = [
|
||||
'name' => $filename,
|
||||
'url' => $url,
|
||||
'sha' => md5($response->body()),
|
||||
];
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ($sqlFiles !== []) {
|
||||
usort($sqlFiles, fn ($a, $b) => strcmp($a['name'], $b['name']));
|
||||
|
||||
return $sqlFiles;
|
||||
}
|
||||
|
||||
return [];
|
||||
} catch (\Exception $e) {
|
||||
Log::warning('[EmulatorSql] Could not fetch SQL files', ['error' => $e->getMessage()]);
|
||||
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
private function fetchRecentSqlFiles(string $branch): array
|
||||
{
|
||||
$weekAgo = now()->subDays(7)->toIso8601String();
|
||||
|
||||
$githubToken = setting('github_token', '');
|
||||
$headers = [
|
||||
'Accept' => 'application/vnd.github+json',
|
||||
'User-Agent' => 'AtomCMS-EmulatorUpdate/1.0',
|
||||
];
|
||||
if (! empty($githubToken)) {
|
||||
$headers['Authorization'] = 'Bearer ' . $githubToken;
|
||||
}
|
||||
|
||||
$folderNames = ['Database Updates', 'database_updates', 'sql', 'updates'];
|
||||
|
||||
try {
|
||||
foreach ($folderNames as $folderName) {
|
||||
$response = Http::withHeaders($headers)->timeout(30)->get("https://api.github.com/repos/{$this->githubRepo}/commits", [
|
||||
'path' => $folderName,
|
||||
'sha' => $branch,
|
||||
'since' => $weekAgo,
|
||||
'per_page' => 100,
|
||||
]);
|
||||
|
||||
if ($response->successful()) {
|
||||
$commits = $response->json();
|
||||
|
||||
if (! is_array($commits) || $commits === []) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$sqlFiles = [];
|
||||
|
||||
foreach ($commits as $commit) {
|
||||
$sha = $commit['sha'] ?? null;
|
||||
$commitDate = $commit['commit']['committer']['date'] ?? null;
|
||||
|
||||
if (! $sha) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$commitResponse = Http::withHeaders($headers)->timeout(30)->get("https://api.github.com/repos/{$this->githubRepo}/commits/{$sha}");
|
||||
|
||||
if (! $commitResponse->successful()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$commitData = $commitResponse->json();
|
||||
$files = $commitData['files'] ?? [];
|
||||
|
||||
foreach ($files as $file) {
|
||||
$filename = $file['filename'] ?? '';
|
||||
|
||||
if (! str_ends_with(strtolower((string) $filename), '.sql')) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$name = basename((string) $filename);
|
||||
$sqlFiles[] = [
|
||||
'name' => $name,
|
||||
'url' => $file['raw_url'] ?? "https://raw.githubusercontent.com/{$this->githubRepo}/{$sha}/{$filename}",
|
||||
'sha' => $sha,
|
||||
'date' => $commitDate,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
if ($sqlFiles !== []) {
|
||||
usort($sqlFiles, fn ($a, $b) => strcmp($a['name'], $b['name']));
|
||||
|
||||
return $sqlFiles;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return [];
|
||||
} catch (\Exception $e) {
|
||||
Log::warning('[EmulatorSql] Could not fetch recent SQL files', ['error' => $e->getMessage()]);
|
||||
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
private function downloadAndRunSql(array $file): array
|
||||
{
|
||||
try {
|
||||
$response = Http::timeout(60)->get($file['url']);
|
||||
|
||||
if (! $response->successful()) {
|
||||
return ['success' => false, 'error' => 'Download mislukt'];
|
||||
}
|
||||
|
||||
$sql = $this->cleanSql($response->body());
|
||||
|
||||
if (in_array(trim($sql), ['', '0'], true)) {
|
||||
return ['success' => true, 'message' => 'Lege SQL file overgeslagen'];
|
||||
}
|
||||
|
||||
$host = setting('emulator_database_host', config('database.connections.emulator.host', '127.0.0.1'));
|
||||
$port = setting('emulator_database_port', config('database.connections.emulator.port', '3306'));
|
||||
$name = setting('emulator_database_name', config('database.connections.emulator.database', ''));
|
||||
$username = setting('emulator_database_username', config('database.connections.emulator.username', ''));
|
||||
$password = setting('emulator_database_password', config('database.connections.emulator.password', ''));
|
||||
|
||||
if (empty($name) || empty($username)) {
|
||||
return ['success' => false, 'error' => 'Emulator database niet geconfigureerd'];
|
||||
}
|
||||
|
||||
$pdo = new \PDO(
|
||||
"mysql:host={$host};port={$port};dbname={$name};charset=utf8mb4",
|
||||
$username,
|
||||
$password,
|
||||
[\PDO::ATTR_ERRMODE => \PDO::ERRMODE_EXCEPTION],
|
||||
);
|
||||
|
||||
$statements = $this->splitSqlStatements($sql);
|
||||
$successCount = 0;
|
||||
$skipCount = 0;
|
||||
|
||||
foreach ($statements as $statement) {
|
||||
$statement = trim((string) $statement);
|
||||
if ($statement === '' || $statement === '0') {
|
||||
continue;
|
||||
}
|
||||
|
||||
try {
|
||||
$pdo->exec($statement);
|
||||
$successCount++;
|
||||
} catch (\PDOException $e) {
|
||||
if ($this->isDuplicateError($e)) {
|
||||
$skipCount++;
|
||||
|
||||
continue;
|
||||
}
|
||||
Log::warning('[SQL Update] Statement error: ' . $e->getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
Log::info('[SQL Update] Successfully ran: ' . $file['name'] . " ({$successCount} statements, {$skipCount} skipped)");
|
||||
|
||||
return ['success' => true, 'message' => "SQL uitgevoerd ({$successCount} statements, {$skipCount} duplicate)"];
|
||||
} catch (\Exception $e) {
|
||||
Log::error('[SQL Update] Failed: ' . $file['name'], ['error' => $e->getMessage()]);
|
||||
|
||||
return ['success' => false, 'error' => $e->getMessage()];
|
||||
}
|
||||
}
|
||||
|
||||
private function cleanSql(string $sql): string
|
||||
{
|
||||
$sql = preg_replace('/--.*$/m', '', $sql);
|
||||
$sql = preg_replace('/#.*$/m', '', (string) $sql);
|
||||
$sql = preg_replace('/SET FOREIGN_KEY_CHECKS.*?;/i', '', (string) $sql);
|
||||
|
||||
return preg_replace('/SET @@SESSION.SQL_MODE.*?;/i', '', (string) $sql);
|
||||
}
|
||||
|
||||
private function splitSqlStatements(string $sql): array
|
||||
{
|
||||
$parts = explode(';', $sql);
|
||||
|
||||
return array_filter($parts, fn ($part) => trim((string) $part) !== '');
|
||||
}
|
||||
|
||||
private function isDuplicateError(\PDOException $e): bool
|
||||
{
|
||||
$message = strtolower($e->getMessage());
|
||||
$patterns = [
|
||||
'duplicate entry',
|
||||
"table '",
|
||||
'already exists',
|
||||
"can't create",
|
||||
'duplicate key',
|
||||
'duplicate index',
|
||||
'error 1061',
|
||||
'error 1062',
|
||||
'error 1826',
|
||||
];
|
||||
|
||||
return array_any($patterns, fn ($pattern) => str_contains($message, (string) $pattern));
|
||||
}
|
||||
}
|
||||
@@ -1,407 +0,0 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Services;
|
||||
|
||||
use App\Models\Miscellaneous\WebsiteSetting;
|
||||
use App\Services\Emulator\EmulatorBackupService;
|
||||
use App\Services\Emulator\EmulatorBuildService;
|
||||
use App\Services\Emulator\EmulatorJarService;
|
||||
use App\Services\Emulator\EmulatorSourceService;
|
||||
use App\Services\Emulator\EmulatorSqlService;
|
||||
use App\Services\Emulator\EmulatorStatusService;
|
||||
use Illuminate\Support\Facades\Cache;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Illuminate\Support\Facades\Process;
|
||||
|
||||
class EmulatorUpdateService
|
||||
{
|
||||
private readonly EmulatorStatusService $statusService;
|
||||
|
||||
private readonly EmulatorJarService $jarService;
|
||||
|
||||
private readonly EmulatorSourceService $sourceService;
|
||||
|
||||
private readonly EmulatorBuildService $buildService;
|
||||
|
||||
private readonly EmulatorSqlService $sqlService;
|
||||
|
||||
private readonly EmulatorBackupService $backupService;
|
||||
|
||||
private readonly SettingsService $settings;
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->statusService = new EmulatorStatusService;
|
||||
$this->jarService = new EmulatorJarService;
|
||||
$this->sourceService = new EmulatorSourceService;
|
||||
$this->buildService = new EmulatorBuildService;
|
||||
$this->sqlService = new EmulatorSqlService;
|
||||
$this->backupService = new EmulatorBackupService;
|
||||
$this->settings = app(SettingsService::class);
|
||||
}
|
||||
|
||||
public function isConfigured(): bool
|
||||
{
|
||||
return $this->statusService->isConfigured();
|
||||
}
|
||||
|
||||
public function getStatus(): array
|
||||
{
|
||||
$status = $this->statusService->getStatus();
|
||||
$updateCheck = $this->jarService->checkForUpdates();
|
||||
$sourceInfo = $this->sourceService->checkForUpdates();
|
||||
|
||||
return array_merge($status, [
|
||||
'update_available' => $updateCheck['update_available'] ?? false,
|
||||
'current_version' => $updateCheck['current_version'] ?? setting('emulator_version', 'N/A'),
|
||||
'latest_version' => $updateCheck['latest_version'] ?? 'N/A',
|
||||
'update_type' => $updateCheck['type'] ?? 'unknown',
|
||||
'has_source_updates' => $sourceInfo['has_update'] ?? false,
|
||||
'latest_sha' => $sourceInfo['latest_sha'] ?? null,
|
||||
'latest_message' => $sourceInfo['latest_message'] ?? null,
|
||||
'latest_author' => $sourceInfo['latest_author'] ?? null,
|
||||
'latest_date' => $sourceInfo['latest_date'] ?? null,
|
||||
'stored_sha' => $sourceInfo['stored_sha'] ?? null,
|
||||
'stored_date' => $sourceInfo['stored_date'] ?? null,
|
||||
'source_info' => $sourceInfo,
|
||||
]);
|
||||
}
|
||||
|
||||
public function checkForUpdates(): array
|
||||
{
|
||||
return $this->jarService->checkForUpdates();
|
||||
}
|
||||
|
||||
public function checkForSqlUpdates(bool $recentOnly = true): array
|
||||
{
|
||||
return $this->sqlService->checkForUpdates($recentOnly);
|
||||
}
|
||||
|
||||
public function runSqlUpdates(): array
|
||||
{
|
||||
return $this->sqlService->runUpdates();
|
||||
}
|
||||
|
||||
public function getAppliedSqlUpdates(): array
|
||||
{
|
||||
return $this->sqlService->getAppliedUpdates();
|
||||
}
|
||||
|
||||
public function updateEmulator(): array
|
||||
{
|
||||
if (! $this->isConfigured()) {
|
||||
return ['success' => false, 'error' => 'Geen GitHub URL geconfigureerd'];
|
||||
}
|
||||
|
||||
$check = $this->checkForUpdates();
|
||||
|
||||
if (! ($check['update_available'] ?? false)) {
|
||||
if ($check['type'] === 'not_found' && ($check['source_available'] ?? false)) {
|
||||
return $this->buildFromSource();
|
||||
}
|
||||
|
||||
return ['success' => false, 'error' => 'Emulator is al up-to-date'];
|
||||
}
|
||||
|
||||
$hasSourceUpdates = ($check['has_source_updates'] ?? false) || ($check['type'] ?? '') === 'source_build';
|
||||
|
||||
if ($hasSourceUpdates && $this->sourceService->isSourceBuildAvailable()) {
|
||||
return $this->buildFromSource();
|
||||
}
|
||||
|
||||
if ($check['type'] === 'source_build') {
|
||||
return $this->buildFromSource();
|
||||
}
|
||||
|
||||
if (! ($check['jar_url'] ?? null)) {
|
||||
return ['success' => false, 'error' => 'Geen .jar gevonden'];
|
||||
}
|
||||
|
||||
$result = $this->jarService->performUpdate($check);
|
||||
|
||||
if ($result['success']) {
|
||||
$this->runSqlUpdates();
|
||||
|
||||
if ($this->restartEmulator()) {
|
||||
$result['restarted'] = true;
|
||||
$result['message'] = ($result['message'] ?? '') . ' | 🔄 Emulator herstart';
|
||||
}
|
||||
}
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
public function performUpdate(array $check): array
|
||||
{
|
||||
return $this->jarService->performUpdate($check);
|
||||
}
|
||||
|
||||
public function buildFromSource(bool $force = false): array
|
||||
{
|
||||
return $this->buildService->buildFromSource($force);
|
||||
}
|
||||
|
||||
public function restartEmulator(): bool
|
||||
{
|
||||
$serviceName = $this->settings->getOrDefault('emulator_service_name', 'emulator');
|
||||
|
||||
try {
|
||||
Log::info('[EmulatorUpdate] Restarting emulator service: ' . $serviceName);
|
||||
|
||||
$result = Process::timeout(30)->run("systemctl restart {$serviceName} 2>&1");
|
||||
if ($result->successful()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
$result = Process::timeout(30)->run("service {$serviceName} restart 2>&1");
|
||||
|
||||
return $result->successful();
|
||||
} catch (\Exception $e) {
|
||||
Log::error('[EmulatorUpdate] Failed to restart emulator', ['error' => $e->getMessage()]);
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public function getBackupList(): array
|
||||
{
|
||||
return $this->backupService->getList();
|
||||
}
|
||||
|
||||
public function restoreBackup(string $backupName): array
|
||||
{
|
||||
return $this->backupService->restore($backupName);
|
||||
}
|
||||
|
||||
public function getInstalledVersion(): string
|
||||
{
|
||||
return $this->statusService->getInstalledVersion();
|
||||
}
|
||||
|
||||
public function getInstalledJar(): ?string
|
||||
{
|
||||
return $this->statusService->getInstalledJar();
|
||||
}
|
||||
|
||||
public function getInstalledJarInfo(): array
|
||||
{
|
||||
return $this->statusService->getInstalledJarInfo();
|
||||
}
|
||||
|
||||
public function getLastSqlUpdate(): ?string
|
||||
{
|
||||
return setting('emulator_last_sql_update');
|
||||
}
|
||||
|
||||
public function debugStatus(): array
|
||||
{
|
||||
return Cache::remember('emulator_debug_status', 120, function () {
|
||||
$installedDate = $this->settings->getOrDefault('emulator_jar_installed_date', null);
|
||||
$sourceCommit = $this->settings->getOrDefault('emulator_source_commit', null);
|
||||
$sourceDate = $this->settings->getOrDefault('emulator_source_date', null);
|
||||
$emulatorVersion = $this->settings->getOrDefault('emulator_version', null);
|
||||
$jarFiles = $this->statusService->getInstalledJarInfo();
|
||||
|
||||
return [
|
||||
'github_url' => $this->settings->getOrDefault('emulator_github_url', ''),
|
||||
'github_repo' => $this->settings->getOrDefault('emulator_source_repo', ''),
|
||||
'github_branch' => $this->settings->getOrDefault('emulator_github_branch', 'main'),
|
||||
'source_repo' => $this->settings->getOrDefault('emulator_source_repo', ''),
|
||||
'source_branch' => $this->settings->getOrDefault('emulator_github_branch', 'main'),
|
||||
'installed_date' => $installedDate,
|
||||
'installed_date_formatted' => $installedDate ? date('Y-m-d H:i:s', (int) $installedDate) : null,
|
||||
'source_commit' => $sourceCommit,
|
||||
'source_date' => $sourceDate,
|
||||
'source_date_formatted' => $sourceDate ? date('Y-m-d H:i:s', (int) $sourceDate) : null,
|
||||
'emulator_version' => $emulatorVersion,
|
||||
'jar_files' => $jarFiles,
|
||||
'installed_branch' => $this->settings->getOrDefault('emulator_installed_branch', null),
|
||||
];
|
||||
});
|
||||
}
|
||||
|
||||
public function resetInstalledDate(): void
|
||||
{
|
||||
WebsiteSetting::where('key', 'emulator_jar_installed_date')->delete();
|
||||
WebsiteSetting::where('key', 'emulator_source_commit')->delete();
|
||||
WebsiteSetting::where('key', 'emulator_source_date')->delete();
|
||||
}
|
||||
|
||||
public function clearAllLogs(): array
|
||||
{
|
||||
$cleared = [];
|
||||
$paths = [
|
||||
storage_path('logs') => 'Laravel Logs',
|
||||
storage_path('logs/emulator.log') => 'Emulator Log',
|
||||
'/tmp/emulator-update-*' => 'Emulator Update Temp',
|
||||
'/tmp/nitro-switch-*' => 'Nitro Switch Logs',
|
||||
'/tmp/nitro_*' => 'Nitro Temp',
|
||||
'/var/www/Emulator/logs' => 'Emulator Folder Logs',
|
||||
];
|
||||
|
||||
foreach ($paths as $path => $label) {
|
||||
try {
|
||||
if (str_contains($path, '*')) {
|
||||
Process::timeout(10)->run("rm -f {$path} 2>/dev/null || true");
|
||||
$cleared[] = $label;
|
||||
} elseif (is_dir($path)) {
|
||||
Process::timeout(10)->run("find {$path} -name '*.log' -mtime +1 -delete 2>/dev/null || true");
|
||||
$cleared[] = $label;
|
||||
} elseif (is_file($path)) {
|
||||
@unlink($path);
|
||||
$cleared[] = $label;
|
||||
}
|
||||
} catch (\Exception) {
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
$laravelLog = storage_path('logs/laravel.log');
|
||||
if (is_file($laravelLog)) {
|
||||
file_put_contents($laravelLog, '');
|
||||
$cleared[] = 'laravel.log';
|
||||
}
|
||||
} catch (\Exception) {
|
||||
}
|
||||
|
||||
Process::timeout(10)->run("find /tmp -name 'emulator_*' -mtime +1 -delete 2>/dev/null || true");
|
||||
Process::timeout(10)->run("find /tmp -name 'nitro_*' -mtime +1 -delete 2>/dev/null || true");
|
||||
Process::timeout(10)->run("find /tmp -name 'deploy_*' -mtime +1 -delete 2>/dev/null || true");
|
||||
|
||||
return [
|
||||
'success' => true,
|
||||
'cleared' => $cleared,
|
||||
'message' => count($cleared) . ' log locaties geleegd',
|
||||
];
|
||||
}
|
||||
|
||||
public function repairEmulator(): array
|
||||
{
|
||||
$actions = [];
|
||||
$errors = [];
|
||||
|
||||
Log::info('[EmulatorUpdate] Starting repair process');
|
||||
|
||||
try {
|
||||
$status = $this->getStatus();
|
||||
|
||||
if (! ($status['jar_exists'] ?? false)) {
|
||||
$actions[] = 'JAR bestand ontbreekt - downloaden...';
|
||||
$updateResult = $this->updateEmulator();
|
||||
if (! $updateResult['success']) {
|
||||
$errors[] = 'Kon JAR niet herstellen: ' . ($updateResult['error'] ?? 'Onbekende fout');
|
||||
} else {
|
||||
$actions[] = 'JAR bestand hersteld';
|
||||
}
|
||||
}
|
||||
|
||||
if (! ($status['service_running'] ?? false)) {
|
||||
$actions[] = 'Emulator service niet actief - starten...';
|
||||
if ($this->restartEmulator()) {
|
||||
$actions[] = 'Emulator service gestart';
|
||||
} else {
|
||||
$errors[] = 'Kon emulator service niet starten';
|
||||
}
|
||||
}
|
||||
|
||||
$sqlRepairResult = $this->sqlService->repair();
|
||||
if (! empty($sqlRepairResult['actions'])) {
|
||||
$actions = array_merge($actions, $sqlRepairResult['actions']);
|
||||
}
|
||||
if (! empty($sqlRepairResult['errors'])) {
|
||||
$errors = array_merge($errors, $sqlRepairResult['errors']);
|
||||
}
|
||||
|
||||
if ($errors !== []) {
|
||||
return [
|
||||
'success' => false,
|
||||
'actions' => $actions,
|
||||
'errors' => $errors,
|
||||
'error' => implode('; ', $errors),
|
||||
];
|
||||
}
|
||||
|
||||
return [
|
||||
'success' => true,
|
||||
'actions' => $actions,
|
||||
'message' => count($actions) . ' acties uitgevoerd',
|
||||
];
|
||||
} catch (\Exception $e) {
|
||||
Log::error('[EmulatorUpdate] Repair exception', ['error' => $e->getMessage()]);
|
||||
|
||||
return [
|
||||
'success' => false,
|
||||
'actions' => $actions,
|
||||
'error' => $e->getMessage(),
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
public function diagnoseSqlUpdates(): array
|
||||
{
|
||||
return $this->sqlService->diagnose();
|
||||
}
|
||||
|
||||
public function diagnose(): array
|
||||
{
|
||||
$diagnosis = [
|
||||
'timestamp' => now()->toIso8601String(),
|
||||
'checks' => [],
|
||||
'issues' => [],
|
||||
'recommendations' => [],
|
||||
];
|
||||
|
||||
try {
|
||||
$status = $this->getStatus();
|
||||
|
||||
$diagnosis['checks']['jar_exists'] = $status['jar_exists'] ?? false;
|
||||
$diagnosis['checks']['jar_files'] = $status['jar_files'] ?? [];
|
||||
$diagnosis['checks']['service_running'] = $status['service_running'] ?? false;
|
||||
$diagnosis['checks']['source_exists'] = $status['source_exists'] ?? false;
|
||||
$diagnosis['checks']['emulator_db_connected'] = $status['emulator_db_connected'] ?? false;
|
||||
$diagnosis['checks']['is_configured'] = $this->isConfigured();
|
||||
$diagnosis['checks']['update_available'] = $status['update_available'] ?? false;
|
||||
|
||||
$sqlDiagnosis = $this->sqlService->diagnose();
|
||||
$diagnosis['checks']['sql_table_exists'] = $sqlDiagnosis['table_exists'] ?? false;
|
||||
$diagnosis['checks']['sql_updates_applied'] = $sqlDiagnosis['applied_count'] ?? 0;
|
||||
$diagnosis['checks']['sql_pending'] = $sqlDiagnosis['pending_count'] ?? 0;
|
||||
|
||||
if (! ($status['jar_exists'] ?? false)) {
|
||||
$diagnosis['issues'][] = 'JAR bestand ontbreekt';
|
||||
$diagnosis['recommendations'][] = 'Voer emulator:update uit om de JAR te downloaden';
|
||||
}
|
||||
|
||||
if (! ($status['service_running'] ?? false)) {
|
||||
$diagnosis['issues'][] = 'Emulator service draait niet';
|
||||
$diagnosis['recommendations'][] = 'Start de service met: sudo systemctl start ' . $this->settings->getOrDefault('emulator_service_name', 'emulator');
|
||||
}
|
||||
|
||||
if (! ($status['emulator_db_connected'] ?? false)) {
|
||||
$diagnosis['issues'][] = 'Emulator database niet bereikbaar';
|
||||
$diagnosis['recommendations'][] = 'Controleer de database credentials in de settings';
|
||||
}
|
||||
|
||||
if (! ($status['source_exists'] ?? false) && $this->sourceService->isSourceBuildAvailable()) {
|
||||
$diagnosis['issues'][] = 'Source code niet gevonden';
|
||||
$diagnosis['recommendations'][] = 'Voer emulator:update --rebuild uit om vanaf source te bouwen';
|
||||
}
|
||||
|
||||
if (! ($sqlDiagnosis['table_exists'] ?? false)) {
|
||||
$diagnosis['issues'][] = 'SQL update tabel ontbreekt';
|
||||
$diagnosis['recommendations'][] = 'Reparatie zal de tabel aanmaken';
|
||||
}
|
||||
|
||||
if (($sqlDiagnosis['pending_count'] ?? 0) > 0) {
|
||||
$diagnosis['issues'][] = $sqlDiagnosis['pending_count'] . ' SQL updates pending';
|
||||
$diagnosis['recommendations'][] = 'Voer reparatie uit om SQL updates toe te passen';
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
$diagnosis['error'] = $e->getMessage();
|
||||
}
|
||||
|
||||
return $diagnosis;
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,186 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services;
|
||||
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
class UpdateHistoryService
|
||||
{
|
||||
private const string TABLE = 'update_history';
|
||||
|
||||
public function ensureTableExists(): void
|
||||
{
|
||||
if (! Schema::hasTable(self::TABLE)) {
|
||||
Schema::create(self::TABLE, function ($table) {
|
||||
$table->id();
|
||||
$table->string('type'); // nitro, emulator, sql, config
|
||||
$table->string('action'); // update, build, deploy, fix
|
||||
$table->string('item')->nullable(); // filename, version, etc
|
||||
$table->string('status'); // success, failed, pending
|
||||
$table->text('message')->nullable();
|
||||
$table->string('user')->nullable();
|
||||
$table->string('ip')->nullable();
|
||||
$table->timestamp('created_at')->useCurrent();
|
||||
$table->index(['type', 'created_at']);
|
||||
$table->index('status');
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
public function log(string $type, string $action, ?string $item = null, string $status = 'success', ?string $message = null): void
|
||||
{
|
||||
$this->ensureTableExists();
|
||||
|
||||
DB::table(self::TABLE)->insert([
|
||||
'type' => $type,
|
||||
'action' => $action,
|
||||
'item' => $item,
|
||||
'status' => $status,
|
||||
'message' => $message,
|
||||
'user' => auth()->user()?->name ?? 'System',
|
||||
'ip' => request()->ip(),
|
||||
'created_at' => now(),
|
||||
]);
|
||||
}
|
||||
|
||||
public function getRecent(int $limit = 50): array
|
||||
{
|
||||
$this->ensureTableExists();
|
||||
|
||||
return DB::table(self::TABLE)
|
||||
->orderBy('created_at', 'desc')
|
||||
->limit($limit)
|
||||
->get()
|
||||
->toArray();
|
||||
}
|
||||
|
||||
public function getByType(string $type, int $limit = 50): array
|
||||
{
|
||||
$this->ensureTableExists();
|
||||
|
||||
return DB::table(self::TABLE)
|
||||
->where('type', $type)
|
||||
->orderBy('created_at', 'desc')
|
||||
->limit($limit)
|
||||
->get()
|
||||
->toArray();
|
||||
}
|
||||
|
||||
public function getByStatus(string $status, int $limit = 50): array
|
||||
{
|
||||
$this->ensureTableExists();
|
||||
|
||||
return DB::table(self::TABLE)
|
||||
->where('status', $status)
|
||||
->orderBy('created_at', 'desc')
|
||||
->limit($limit)
|
||||
->get()
|
||||
->toArray();
|
||||
}
|
||||
|
||||
public function getStats(): array
|
||||
{
|
||||
$this->ensureTableExists();
|
||||
|
||||
$total = DB::table(self::TABLE)->count();
|
||||
$success = DB::table(self::TABLE)->where('status', 'success')->count();
|
||||
$failed = DB::table(self::TABLE)->where('status', 'failed')->count();
|
||||
|
||||
$lastUpdate = DB::table(self::TABLE)
|
||||
->orderBy('created_at', 'desc')
|
||||
->first();
|
||||
|
||||
$byType = DB::table(self::TABLE)
|
||||
->select('type', DB::raw('count(*) as count'))
|
||||
->groupBy('type')
|
||||
->pluck('count', 'type')
|
||||
->toArray();
|
||||
|
||||
return [
|
||||
'total' => $total,
|
||||
'success' => $success,
|
||||
'failed' => $failed,
|
||||
'success_rate' => $total > 0 ? round(($success / $total) * 100) : 100,
|
||||
'last_update' => $lastUpdate,
|
||||
'by_type' => $byType,
|
||||
];
|
||||
}
|
||||
|
||||
public function getHtml(): string
|
||||
{
|
||||
$this->ensureTableExists();
|
||||
|
||||
$updates = $this->getRecent(20);
|
||||
$stats = $this->getStats();
|
||||
|
||||
$html = '<div style="font-family: -apple-system, BlinkMacSystemFont, sans-serif;">';
|
||||
|
||||
// Stats
|
||||
$html .= '<div style="display: grid; grid-template-columns: repeat(4, 1fr); gap: 12px; margin-bottom: 16px;">';
|
||||
$html .= '<div style="background: rgba(255,255,255,0.05); padding: 12px; border-radius: 8px; text-align: center;">';
|
||||
$html .= '<div style="font-size: 24px; font-weight: 700; color: #4ade80;">' . $stats['total'] . '</div>';
|
||||
$html .= '<div style="font-size: 10px; color: #64748b; text-transform: uppercase;">Totaal</div></div>';
|
||||
$html .= '<div style="background: rgba(255,255,255,0.05); padding: 12px; border-radius: 8px; text-align: center;">';
|
||||
$html .= '<div style="font-size: 24px; font-weight: 700; color: #4ade80;">' . $stats['success'] . '</div>';
|
||||
$html .= '<div style="font-size: 10px; color: #64748b; text-transform: uppercase;">Geslaagd</div></div>';
|
||||
$html .= '<div style="background: rgba(255,255,255,0.05); padding: 12px; border-radius: 8px; text-align: center;">';
|
||||
$html .= '<div style="font-size: 24px; font-weight: 700; color: #f87171;">' . $stats['failed'] . '</div>';
|
||||
$html .= '<div style="font-size: 10px; color: #64748b; text-transform: uppercase;">Mislukt</div></div>';
|
||||
$html .= '<div style="background: rgba(255,255,255,0.05); padding: 12px; border-radius: 8px; text-align: center;">';
|
||||
$html .= '<div style="font-size: 24px; font-weight: 700; color: #60a5fa;">' . $stats['success_rate'] . '%</div>';
|
||||
$html .= '<div style="font-size: 10px; color: #64748b; text-transform: uppercase;">Succes</div></div>';
|
||||
$html .= '</div>';
|
||||
|
||||
// History list
|
||||
if ($updates === []) {
|
||||
$html .= '<div style="text-align: center; padding: 24px; color: #64748b;">';
|
||||
$html .= '<div style="font-size: 32px; margin-bottom: 8px;">📋</div>';
|
||||
$html .= 'Nog geen update geschiedenis</div>';
|
||||
} else {
|
||||
$html .= '<div style="max-height: 400px; overflow-y: auto;">';
|
||||
foreach ($updates as $update) {
|
||||
$icon = match ($update->status) {
|
||||
'success' => '✅',
|
||||
'failed' => '❌',
|
||||
'pending' => '⏳',
|
||||
default => '⚪'
|
||||
};
|
||||
|
||||
$typeColor = match ($update->type) {
|
||||
'nitro' => '#4ade80',
|
||||
'emulator' => '#60a5fa',
|
||||
'sql' => '#fbbf24',
|
||||
'config' => '#a78bfa',
|
||||
default => '#94a3b8'
|
||||
};
|
||||
|
||||
$time = Carbon::parse($update->created_at)->diffForHumans();
|
||||
|
||||
$html .= '<div style="display: flex; align-items: center; gap: 12px; padding: 10px 12px; background: rgba(255,255,255,0.03); border-radius: 8px; margin-bottom: 6px;">';
|
||||
$html .= '<div style="font-size: 16px;">' . $icon . '</div>';
|
||||
$html .= '<div style="flex: 1;">';
|
||||
$html .= '<div style="display: flex; align-items: center; gap: 8px;">';
|
||||
$html .= '<span style="background: ' . $typeColor . '20; color: ' . $typeColor . '; padding: 2px 8px; border-radius: 12px; font-size: 10px; font-weight: 600; text-transform: uppercase;">' . e($update->type) . '</span>';
|
||||
$html .= '<span style="color: #e2e8f0; font-size: 13px;">' . e($update->action) . '</span>';
|
||||
if ($update->item) {
|
||||
$html .= '<span style="color: #94a3b8; font-size: 12px;">' . e($update->item) . '</span>';
|
||||
}
|
||||
$html .= '</div>';
|
||||
if ($update->message) {
|
||||
$html .= '<div style="color: #64748b; font-size: 11px; margin-top: 2px;">' . e($update->message) . '</div>';
|
||||
}
|
||||
$html .= '</div>';
|
||||
$html .= '<div style="text-align: right;">';
|
||||
$html .= '<div style="color: #64748b; font-size: 10px;">' . e($update->user) . '</div>';
|
||||
$html .= '<div style="color: #475569; font-size: 9px;">' . e($time) . '</div>';
|
||||
$html .= '</div>';
|
||||
$html .= '</div>';
|
||||
}
|
||||
$html .= '</div>';
|
||||
}
|
||||
|
||||
return $html . '</div>';
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user