Remove unnecessary API calls to daemon

Author: DaneEveritt

app/Console/Commands/Server/RebuildServerCommand.php

@@ -18,7 +18,6 @@
 use Pterodactyl\Services\Servers\SuspensionService;
 use Pterodactyl\Services\Servers\ServerDeletionService;
 use Pterodactyl\Services\Servers\ReinstallServerService;
-use Pterodactyl\Services\Servers\ContainerRebuildService;
 use Pterodactyl\Services\Servers\BuildModificationService;
 use Pterodactyl\Services\Databases\DatabasePasswordService;
 use Pterodactyl\Services\Servers\DetailsModificationService;
@@ -54,11 +53,6 @@ class ServersController extends Controller
      */
     protected $config;
 
-    /**
-     * @var \Pterodactyl\Services\Servers\ContainerRebuildService
-     */
-    protected $containerRebuildService;
-
     /**
      * @var \Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface
      */
@@ -121,7 +115,6 @@ class ServersController extends Controller
      * @param \Pterodactyl\Contracts\Repository\AllocationRepositoryInterface $allocationRepository
      * @param \Pterodactyl\Services\Servers\BuildModificationService $buildModificationService
      * @param \Illuminate\Contracts\Config\Repository $config
-     * @param \Pterodactyl\Services\Servers\ContainerRebuildService $containerRebuildService
      * @param \Pterodactyl\Services\Databases\DatabaseManagementService $databaseManagementService
      * @param \Pterodactyl\Services\Databases\DatabasePasswordService $databasePasswordService
      * @param \Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface $databaseRepository
@@ -139,7 +132,6 @@ public function __construct(
         AllocationRepositoryInterface $allocationRepository,
         BuildModificationService $buildModificationService,
         ConfigRepository $config,
-        ContainerRebuildService $containerRebuildService,
         DatabaseManagementService $databaseManagementService,
         DatabasePasswordService $databasePasswordService,
         DatabaseRepositoryInterface $databaseRepository,
@@ -156,7 +148,6 @@ public function __construct(
         $this->allocationRepository = $allocationRepository;
         $this->buildModificationService = $buildModificationService;
         $this->config = $config;
-        $this->containerRebuildService = $containerRebuildService;
         $this->databaseHostRepository = $databaseHostRepository;
         $this->databaseManagementService = $databaseManagementService;
         $this->databasePasswordService = $databasePasswordService;
@@ -235,21 +226,6 @@ public function reinstallServer(Server $server)
         return redirect()->route('admin.servers.view.manage', $server->id);
     }
 
-    /**
-     * Setup a server to have a container rebuild.
-     *
-     * @param \Pterodactyl\Models\Server $server
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
-     */
-    public function rebuildContainer(Server $server)
-    {
-        $this->containerRebuildService->handle($server);
-        $this->alert->success(trans('admin/server.alerts.rebuild_on_boot'))->flash();
-
-        return redirect()->route('admin.servers.view.manage', $server->id);
-    }
-
     /**
      * Manage the suspension status for a server.
      *
@@ -302,7 +278,7 @@ public function updateBuild(Request $request, Server $server)
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Pterodactyl\Exceptions\DisplayException
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     * @throws \Throwable
      */
     public function delete(Request $request, Server $server)
     {
@@ -320,7 +296,6 @@ public function delete(Request $request, Server $server)
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Illuminate\Validation\ValidationException
-     * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */

app/Http/Controllers/Admin/ServersController.php

@@ -63,15 +63,16 @@ public function details(UpdateServerDetailsRequest $request): array
      * Update the build details for a specific server.
      *
      * @param \Pterodactyl\Http\Requests\Api\Application\Servers\UpdateServerBuildConfigurationRequest $request
+     * @param \Pterodactyl\Models\Server $server
      * @return array
      *
      * @throws \Pterodactyl\Exceptions\DisplayException
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function build(UpdateServerBuildConfigurationRequest $request): array
+    public function build(UpdateServerBuildConfigurationRequest $request, Server $server): array
     {
-        $server = $this->buildModificationService->handle($request->getModel(Server::class), $request->validated());
+        $server = $this->buildModificationService->handle($server, $request->validated());
 
         return $this->fractal->item($server)
             ->transformWith($this->getTransformer(ServerTransformer::class))

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

@@ -6,17 +6,11 @@
 use Pterodactyl\Models\Server;
 use Pterodactyl\Services\Servers\SuspensionService;
 use Pterodactyl\Services\Servers\ReinstallServerService;
-use Pterodactyl\Services\Servers\ContainerRebuildService;
 use Pterodactyl\Http\Requests\Api\Application\Servers\ServerWriteRequest;
 use Pterodactyl\Http\Controllers\Api\Application\ApplicationApiController;
 
 class ServerManagementController extends ApplicationApiController
 {
-    /**
-     * @var \Pterodactyl\Services\Servers\ContainerRebuildService
-     */
-    private $rebuildService;
-
     /**
      * @var \Pterodactyl\Services\Servers\ReinstallServerService
      */
@@ -30,18 +24,15 @@ class ServerManagementController extends ApplicationApiController
     /**
      * SuspensionController constructor.
      *
-     * @param \Pterodactyl\Services\Servers\ContainerRebuildService $rebuildService
      * @param \Pterodactyl\Services\Servers\ReinstallServerService $reinstallServerService
      * @param \Pterodactyl\Services\Servers\SuspensionService $suspensionService
      */
     public function __construct(
-        ContainerRebuildService $rebuildService,
         ReinstallServerService $reinstallServerService,
         SuspensionService $suspensionService
     ) {
         parent::__construct();
 
-        $this->rebuildService = $rebuildService;
         $this->reinstallServerService = $reinstallServerService;
         $this->suspensionService = $suspensionService;
     }
@@ -53,9 +44,7 @@ public function __construct(
      * @param \Pterodactyl\Models\Server $server
      * @return \Illuminate\Http\Response
      *
-     * @throws \Pterodactyl\Exceptions\DisplayException
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     * @throws \Throwable
      */
     public function suspend(ServerWriteRequest $request, Server $server): Response
     {
@@ -71,9 +60,7 @@ public function suspend(ServerWriteRequest $request, Server $server): Response
      * @param \Pterodactyl\Models\Server $server
      * @return \Illuminate\Http\Response
      *
-     * @throws \Pterodactyl\Exceptions\DisplayException
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     * @throws \Throwable
      */
     public function unsuspend(ServerWriteRequest $request, Server $server): Response
     {
@@ -99,20 +86,4 @@ public function reinstall(ServerWriteRequest $request, Server $server): Response
 
         return $this->returnNoContent();
     }
-
-    /**
-     * Mark a server as needing its container rebuilt the next time it is started.
-     *
-     * @param \Pterodactyl\Http\Requests\Api\Application\Servers\ServerWriteRequest $request
-     * @param \Pterodactyl\Models\Server $server
-     * @return \Illuminate\Http\Response
-     *
-     * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
-     */
-    public function rebuild(ServerWriteRequest $request, Server $server): Response
-    {
-        $this->rebuildService->handle($server);
-
-        return $this->returnNoContent();
-    }
 }

app/Http/Controllers/Api/Application/Servers/ServerManagementController.php

@@ -107,9 +107,10 @@ public function handle(Server $server, array $data)
         $updateData = $this->structureService->handle($server);
 
         try {
-            $this->daemonServerRepository->setServer($server)->update(
-                Arr::only($updateData, ['allocations', 'build', 'container'])
-            );
+            $this->daemonServerRepository
+                ->setServer($server)
+                ->update(Arr::only($updateData, ['build']));
+
             $this->connection->commit();
         } catch (RequestException $exception) {
             throw new DaemonConnectionException($exception);