Skip to content

Commit 564d947

Browse files
committed
[#3c9g25] Add support for new endpoint to collect node information
1 parent 979bdc1 commit 564d947

File tree

4 files changed

+74
-5
lines changed

4 files changed

+74
-5
lines changed
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<?php
2+
3+
namespace Pterodactyl\Http\Controllers\Admin\Nodes;
4+
5+
use Illuminate\Support\Str;
6+
use Illuminate\Http\Request;
7+
use Pterodactyl\Models\Node;
8+
use Illuminate\Http\JsonResponse;
9+
use Pterodactyl\Http\Controllers\Controller;
10+
use Pterodactyl\Repositories\Wings\DaemonConfigurationRepository;
11+
12+
class SystemInformationController extends Controller
13+
{
14+
/**
15+
* @var \Pterodactyl\Repositories\Wings\DaemonConfigurationRepository
16+
*/
17+
private $repository;
18+
19+
/**
20+
* SystemInformationController constructor.
21+
*
22+
* @param \Pterodactyl\Repositories\Wings\DaemonConfigurationRepository $repository
23+
*/
24+
public function __construct(DaemonConfigurationRepository $repository)
25+
{
26+
$this->repository = $repository;
27+
}
28+
29+
/**
30+
* Returns system information from the Daemon.
31+
*
32+
* @param \Illuminate\Http\Request $request
33+
* @param \Pterodactyl\Models\Node $node
34+
* @return \Illuminate\Http\JsonResponse
35+
*
36+
* @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
37+
*/
38+
public function __invoke(Request $request, Node $node)
39+
{
40+
$data = $this->repository->setNode($node)->getSystemInformation();
41+
42+
return JsonResponse::create([
43+
'version' => $data['version'] ?? '',
44+
'system' => [
45+
'type' => Str::title($data['os'] ?? 'Unknown'),
46+
'arch' => $data['architecture'] ?? '--',
47+
'release' => $data['kernel_version'] ?? '--',
48+
'cpus' => $data['cpu_count'] ?? 0,
49+
],
50+
]);
51+
}
52+
}

app/Repositories/Wings/DaemonConfigurationRepository.php

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,25 @@
22

33
namespace Pterodactyl\Repositories\Wings;
44

5+
use GuzzleHttp\Exception\TransferException;
6+
use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
7+
58
class DaemonConfigurationRepository extends DaemonRepository
69
{
10+
/**
11+
* Returns system information from the wings instance.
12+
*
13+
* @return array
14+
* @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
15+
*/
16+
public function getSystemInformation(): array
17+
{
18+
try {
19+
$response = $this->getHttpClient()->get('/api/system');
20+
} catch (TransferException $exception) {
21+
throw new DaemonConnectionException($exception);
22+
}
23+
24+
return json_decode($response->getBody()->__toString(), true);
25+
}
726
}

resources/views/admin/nodes/view/index.blade.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,14 +153,11 @@
153153
(function getInformation() {
154154
$.ajax({
155155
method: 'GET',
156-
url: '{{ $node->scheme }}://{{ $node->fqdn }}:{{ $node->daemonListen }}/v1',
156+
url: '/admin/nodes/view/{{ $node->id }}/system-information',
157157
timeout: 5000,
158-
headers: {
159-
'X-Access-Token': '{{ $node->daemonSecret }}'
160-
},
161158
}).done(function (data) {
162159
$('[data-attr="info-version"]').html(data.version);
163-
$('[data-attr="info-system"]').html(data.system.type + '(' + data.system.arch + ') <code>' + data.system.release + '</code>');
160+
$('[data-attr="info-system"]').html(data.system.type + ' (' + data.system.arch + ') <code>' + data.system.release + '</code>');
164161
$('[data-attr="info-cpus"]').html(data.system.cpus);
165162
}).fail(function (jqXHR) {
166163

routes/admin.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@
150150
Route::get('/view/{node}/configuration', 'Nodes\NodeViewController@configuration')->name('admin.nodes.view.configuration');
151151
Route::get('/view/{node}/allocation', 'Nodes\NodeViewController@allocations')->name('admin.nodes.view.allocation');
152152
Route::get('/view/{node}/servers', 'Nodes\NodeViewController@servers')->name('admin.nodes.view.servers');
153+
Route::get('/view/{node}/system-information', 'Nodes\SystemInformationController');
153154
Route::get('/view/{node}/settings/token', 'NodesController@setToken')->name('admin.nodes.view.configuration.token');
154155

155156
Route::post('/new', 'NodesController@store');

0 commit comments

Comments
 (0)