Skynet/misc_pterodactyl-panel
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

api(application): v2 backport

Browse source
This commit is contained in:
Matthew Penner 2022-12-14 17:05:46 -07:00
parent 4cd0bee231
commit 67bf3e342e
No known key found for this signature in database
172 changed files with 2922 additions and 1579 deletions
Download patch file Download diff file Expand all files Collapse all files

103
app/Services/Helpers/SoftwareVersionService.php
View file

@ -3,46 +3,54 @@
namespace Pterodactyl\Services\Helpers;
use Exception;
use GuzzleHttp\Client;
use Carbon\CarbonImmutable;
use Illuminate\Support\Arr;
use Illuminate\Support\Str;
use Illuminate\Support\Facades\Http;
use Illuminate\Contracts\Cache\Repository as CacheRepository;
use Pterodactyl\Exceptions\Service\Helper\CdnVersionFetchingException;
class SoftwareVersionService
{
public const VERSION_CACHE_KEY = 'pterodactyl:versioning_data';
public const GIT_VERSION_CACHE_KEY = 'pterodactyl:git_data';
private static array $result;
/**
* SoftwareVersionService constructor.
*/
public function __construct(
protected CacheRepository $cache,
protected Client $client
) {
public function __construct(private CacheRepository $cache)
{
self::$result = $this->cacheVersionData();
}
/**
* Get the latest version of the panel from the CDN servers.
* Return the current version of the panel that is being used.
*/
public function getPanel(): string
public function getCurrentVersion(): string
{
return config('app.version');
}
/**
* Returns the latest version of the panel from the CDN servers.
*/
public function getLatestPanel(): string
{
return Arr::get(self::$result, 'panel') ?? 'error';
}
/**
* Get the latest version of the daemon from the CDN servers.
* Returns the latest version of the Wings from the CDN servers.
*/
public function getDaemon(): string
public function getLatestWings(): string
{
return Arr::get(self::$result, 'wings') ?? 'error';
}
/**
* Get the URL to the discord server.
* Returns the URL to the discord server.
*/
public function getDiscord(): string
{
@ -50,7 +58,7 @@ class SoftwareVersionService
}
/**
* Get the URL for donations.
* Returns the URL for donations.
*/
public function getDonations(): string
{
@ -62,23 +70,80 @@ class SoftwareVersionService
*/
public function isLatestPanel(): bool
{
if (config('app.version') === 'canary') {
$version = $this->getCurrentVersion();
if ($version === 'canary') {
return true;
}
return version_compare(config('app.version'), $this->getPanel()) >= 0;
return version_compare($version, $this->getLatestPanel()) >= 0;
}
/**
* Determine if a passed daemon version string is the latest.
*/
public function isLatestDaemon(string $version): bool
public function isLatestWings(string $version): bool
{
if ($version === 'develop') {
if ($version === 'develop' || Str::startsWith($version, 'dev-')) {
return true;
}
return version_compare($version, $this->getDaemon()) >= 0;
return version_compare($version, $this->getLatestWings()) >= 0;
}
/**
* ?
*/
public function getVersionData(): array
{
$versionData = $this->versionData();
if ($versionData['is_git']) {
$git = $versionData['version'];
} else {
$git = null;
}
return [
'panel' => [
'current' => $this->getCurrentVersion(),
'latest' => $this->getLatestPanel(),
],
'wings' => [
'latest' => $this->getLatestWings(),
],
'git' => $git,
];
}
/**
* Return version information for the footer.
*/
protected function versionData(): array
{
return $this->cache->remember(self::GIT_VERSION_CACHE_KEY, CarbonImmutable::now()->addSeconds(15), function () {
$configVersion = config()->get('app.version');
if (file_exists(base_path('.git/HEAD'))) {
$head = explode(' ', file_get_contents(base_path('.git/HEAD')));
if (array_key_exists(1, $head)) {
$path = base_path('.git/' . trim($head[1]));
}
}
if (isset($path) && file_exists($path)) {
return [
'version' => substr(file_get_contents($path), 0, 8),
'is_git' => true,
];
}
return [
'version' => $configVersion,
'is_git' => false,
];
});
}
/**
@ -88,10 +153,10 @@ class SoftwareVersionService
{
return $this->cache->remember(self::VERSION_CACHE_KEY, CarbonImmutable::now()->addMinutes(config('pterodactyl.cdn.cache_time', 60)), function () {
try {
$response = $this->client->request('GET', config('pterodactyl.cdn.url'));
$response = Http::get(config('pterodactyl.cdn.url'));
if ($response->getStatusCode() === 200) {
return json_decode($response->getBody(), true);
if ($response->status() === 200) {
return json_decode($response->body(), true);
}
throw new CdnVersionFetchingException();