Add version checking to daemon and panel
Also includes some buttons for users to get help from the panel.
This commit is contained in:
parent
261535d83d
commit
90cd2b677e
6 changed files with 157 additions and 9 deletions
|
@ -24,6 +24,7 @@
|
||||||
namespace Pterodactyl\Console\Commands;
|
namespace Pterodactyl\Console\Commands;
|
||||||
|
|
||||||
use Illuminate\Console\Command;
|
use Illuminate\Console\Command;
|
||||||
|
use Version;
|
||||||
|
|
||||||
class ShowVersion extends Command
|
class ShowVersion extends Command
|
||||||
{
|
{
|
||||||
|
@ -58,6 +59,6 @@ class ShowVersion extends Command
|
||||||
*/
|
*/
|
||||||
public function handle()
|
public function handle()
|
||||||
{
|
{
|
||||||
$this->info('You are running Pterodactyl Panel ' . config('app.version'));
|
$this->info('You are running Pterodactyl Panel v' . Version::getCurrentPanel() . ' (' . ((Version::isLatestPanel()) ? 'Up to Date' : 'Latest: ' . Version::getDaemon()) . ')');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
35
app/Facades/Version.php
Normal file
35
app/Facades/Version.php
Normal file
|
@ -0,0 +1,35 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Pterodactyl - Panel
|
||||||
|
* Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com>
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in all
|
||||||
|
* copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
* SOFTWARE.
|
||||||
|
*/
|
||||||
|
namespace Pterodactyl\Facades;
|
||||||
|
|
||||||
|
use Illuminate\Support\Facades\Facade;
|
||||||
|
|
||||||
|
class Version extends Facade
|
||||||
|
{
|
||||||
|
|
||||||
|
protected static function getFacadeAccessor()
|
||||||
|
{
|
||||||
|
return '\Pterodactyl\Services\VersionService';
|
||||||
|
}
|
||||||
|
}
|
93
app/Services/VersionService.php
Normal file
93
app/Services/VersionService.php
Normal file
|
@ -0,0 +1,93 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Pterodactyl - Panel
|
||||||
|
* Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com>
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in all
|
||||||
|
* copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
* SOFTWARE.
|
||||||
|
*/
|
||||||
|
namespace Pterodactyl\Services;
|
||||||
|
|
||||||
|
use Cache;
|
||||||
|
use GuzzleHttp\Client;
|
||||||
|
|
||||||
|
class VersionService
|
||||||
|
{
|
||||||
|
|
||||||
|
protected static $versions;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructor
|
||||||
|
*/
|
||||||
|
public function __construct()
|
||||||
|
{
|
||||||
|
self::$versions = Cache::remember('versions', env('VERSION_CACHE_TIME', 60), function () {
|
||||||
|
$client = new Client();
|
||||||
|
|
||||||
|
try {
|
||||||
|
$response = $client->request('GET', env('VERSION_CHECK_URL', 'https://cdn.pterodactyl.io/releases/latest.json'));
|
||||||
|
|
||||||
|
if ($response->getStatusCode() === 200) {
|
||||||
|
return json_decode($response->getBody());
|
||||||
|
} else {
|
||||||
|
throw new \Exception('Invalid response code.');
|
||||||
|
}
|
||||||
|
} catch (\Exception $ex) {
|
||||||
|
// Failed request, just return errored version.
|
||||||
|
return (object) [
|
||||||
|
'panel' => 'error',
|
||||||
|
'daemon' => 'error',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function getPanel()
|
||||||
|
{
|
||||||
|
return self::$versions->panel;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function getDaemon()
|
||||||
|
{
|
||||||
|
return self::$versions->daemon;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getCurrentPanel()
|
||||||
|
{
|
||||||
|
return config('app.version');
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function isLatestPanel()
|
||||||
|
{
|
||||||
|
if (config('app.version') === 'canary') {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (version_compare(config('app.version'), self::$versions->panel) >= 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function isLatestDaemon($daemon)
|
||||||
|
{
|
||||||
|
if ($daemon === '0.0.0-canary') {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (version_compare($daemon, self::$versions->daemon) >= 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -217,6 +217,7 @@ return [
|
||||||
'URL' => Illuminate\Support\Facades\URL::class,
|
'URL' => Illuminate\Support\Facades\URL::class,
|
||||||
'Uuid' => Webpatser\Uuid\Uuid::class,
|
'Uuid' => Webpatser\Uuid\Uuid::class,
|
||||||
'Validator' => Illuminate\Support\Facades\Validator::class,
|
'Validator' => Illuminate\Support\Facades\Validator::class,
|
||||||
|
'Version' => Pterodactyl\Facades\Version::class,
|
||||||
'View' => Illuminate\Support\Facades\View::class,
|
'View' => Illuminate\Support\Facades\View::class,
|
||||||
|
|
||||||
],
|
],
|
||||||
|
|
|
@ -24,13 +24,31 @@
|
||||||
@endsection
|
@endsection
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
<div class="col-md-12">
|
<div class="row">
|
||||||
<ul class="breadcrumb">
|
<div class="col-md-12">
|
||||||
<li class="active">Admin Control</li>
|
<ul class="breadcrumb">
|
||||||
</ul>
|
<li class="active">Admin Control</li>
|
||||||
<h3 class="nopad">Pterodactyl Admin Control Panel</h3><hr />
|
</ul>
|
||||||
<p>Welcome to the most advanced, lightweight, and user-friendly open source game server control panel.</p>
|
<h3 class="nopad">Pterodactyl Admin Control Panel</h3><hr />
|
||||||
<p>You are running version <code>{{ config('app.version') }}</code>.</p>
|
@if (Version::isLatestPanel())
|
||||||
|
<div class="alert alert-success">You are running Pterodactyl Panel version <code>{{ Version::getCurrentPanel() }}</code>. Your panel is up-to-date!</div>
|
||||||
|
@else
|
||||||
|
<div class="alert alert-danger">
|
||||||
|
Your panel is <strong>not up-to-date!</strong> The latest version is <a href="https://github.com/Pterodactyl/Panel/releases/v{{ Version::getPanel() }}" target="_blank"><code>{{ Version::getPanel() }}</code></a> and you are currently running version <code>{{ Version::getCurrentPanel() }}</code>.
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-xs-4 text-center">
|
||||||
|
<a href="https://discord.gg/0gYt8oU8QOkDhKLS"><button class="btn btn-sm btn-warning" style="width:100%;"><i class="fa fa-fw fa-support"></i> Get Help <small>(via Discord)</small></button></a>
|
||||||
|
</div>
|
||||||
|
<div class="col-xs-4 text-center">
|
||||||
|
<a href="https://docs.pterodactyl.io"><button class="btn btn-sm btn-default" style="width:100%;"><i class="fa fa-fw fa-link"></i> Documentation</button></a>
|
||||||
|
</div>
|
||||||
|
<div class="col-xs-4 text-center">
|
||||||
|
<a href="https://github.com/Pterodactyl/Panel"><button class="btn btn-sm btn-default" style="width:100%;"><i class="fa fa-fw fa-support"></i> Github</button></a>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<script>
|
<script>
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
|
|
|
@ -71,7 +71,7 @@
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Daemon Version</td>
|
<td>Daemon Version</td>
|
||||||
<td><code data-attr="info-version"><i class="fa fa-refresh fa-fw fa-spin"></i></code></td>
|
<td><code data-attr="info-version"><i class="fa fa-refresh fa-fw fa-spin"></i></code> (Latest: <code>{{ Version::getPanel() }}</code>)</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>System Information</td>
|
<td>System Information</td>
|
||||||
|
|
Loading…
Reference in a new issue