Merge pull request pterodactyl#1903 from matthewpi/enhancement/wings-improved-server-loading

[Wings] Improved Server Loading

Author: DaneEveritt

app/Contracts/Repository/ServerRepositoryInterface.php

@@ -171,4 +171,16 @@ public function getSuspendedServersCount(): int;
      * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
      */
     public function loadAllServersForNode(int $node, int $limit): LengthAwarePaginator;
+
+    /**
+     * Returns every server that exists for a given node.
+     *
+     * This is different from {@see loadAllServersForNode} because
+     * it does not paginate the response.
+     *
+     * @param int $node
+     *
+     * @return \Illuminate\Database\Eloquent\Builder[]|\Illuminate\Database\Eloquent\Collection
+     */
+    public function loadEveryServerForNode(int $node);
 }

app/Http/Controllers/Api/Remote/Servers/ServerDetailsController.php

@@ -5,6 +5,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
 use Pterodactyl\Http\Controllers\Controller;
+use Pterodactyl\Repositories\Eloquent\NodeRepository;
 use Pterodactyl\Services\Eggs\EggConfigurationService;
 use Pterodactyl\Repositories\Eloquent\ServerRepository;
 use Pterodactyl\Services\Servers\ServerConfigurationStructureService;
@@ -26,21 +27,29 @@ class ServerDetailsController extends Controller
      */
     private $configurationStructureService;
 
+    /**
+     * @var \Pterodactyl\Repositories\Eloquent\NodeRepository
+     */
+    private $nodeRepository;
+
     /**
      * ServerConfigurationController constructor.
      *
      * @param \Pterodactyl\Repositories\Eloquent\ServerRepository $repository
      * @param \Pterodactyl\Services\Servers\ServerConfigurationStructureService $configurationStructureService
      * @param \Pterodactyl\Services\Eggs\EggConfigurationService $eggConfigurationService
+     * @param \Pterodactyl\Repositories\Eloquent\NodeRepository $nodeRepository
      */
     public function __construct(
         ServerRepository $repository,
         ServerConfigurationStructureService $configurationStructureService,
-        EggConfigurationService $eggConfigurationService
+        EggConfigurationService $eggConfigurationService,
+        NodeRepository $nodeRepository
     ) {
         $this->eggConfigurationService = $eggConfigurationService;
         $this->repository = $repository;
         $this->configurationStructureService = $configurationStructureService;
+        $this->nodeRepository = $nodeRepository;
     }
 
     /**
@@ -62,4 +71,30 @@ public function __invoke(Request $request, $uuid)
             'process_configuration' => $this->eggConfigurationService->handle($server),
         ]);
     }
+
+    /**
+     * Lists all servers with their configurations that are assigned to the requesting node.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return \Illuminate\Http\JsonResponse
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function list(Request $request)
+    {
+        $node = $request->attributes->get('node');
+        $servers = $this->repository->loadEveryServerForNode($node->id);
+
+        $configurations = [];
+
+        foreach ($servers as $server) {
+            $configurations[$server->uuid] = [
+                'settings' => $this->configurationStructureService->handle($server),
+                'process_configuration' => $this->eggConfigurationService->handle($server),
+            ];
+        }
+
+        return JsonResponse::create($configurations);
+    }
 }

app/Http/Middleware/Api/Daemon/DaemonAuthenticate.php

@@ -69,7 +69,7 @@ public function handle(Request $request, Closure $next)
         // Ensure that all of the correct parts are provided in the header.
         if (count($parts) !== 2 || empty($parts[0]) || empty($parts[1])) {
             throw new BadRequestHttpException(
-                'The Authorization headed provided was not in a valid format.',
+                'The Authorization headed provided was not in a valid format.'
             );
         }
 

app/Repositories/Eloquent/ServerRepository.php

@@ -378,4 +378,22 @@ public function loadAllServersForNode(int $node, int $limit): LengthAwarePaginat
             ->where('node_id', '=', $node)
             ->paginate($limit);
     }
+
+    /**
+     * Returns every server that exists for a given node.
+     *
+     * This is different from {@see loadAllServersForNode} because
+     * it does not paginate the response.
+     *
+     * @param int $node
+     *
+     * @return \Illuminate\Database\Eloquent\Builder[]|\Illuminate\Database\Eloquent\Collection
+     */
+    public function loadEveryServerForNode(int $node)
+    {
+        return $this->getBuilder()
+            ->with('nest')
+            ->where('node_id', '=', $node)
+            ->get();
+    }
 }

routes/api-remote.php

@@ -7,6 +7,9 @@
 
 // Routes for the Wings daemon.
 Route::post('/sftp/auth', 'SftpAuthenticationController');
+
+Route::get('/servers', 'Servers\ServerDetailsController@list');
+
 Route::group(['prefix' => '/servers/{uuid}'], function () {
     Route::get('/', 'Servers\ServerDetailsController');
     Route::get('/install', 'Servers\ServerInstallController@index');