Check that the selected daemon is online for a transfer, delete the server from the old node when a transfer is successful

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

@@ -6,15 +6,16 @@ use Cake\Chronos\Chronos;
 use Lcobucci\JWT\Builder;
 use Illuminate\Http\Request;
 use Lcobucci\JWT\Signer\Key;
+use Psr\Log\LoggerInterface;
 use Illuminate\Http\Response;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Facades\Log;
 use Lcobucci\JWT\Signer\Hmac\Sha256;
 use Illuminate\Database\ConnectionInterface;
 use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Services\Servers\SuspensionService;
 use Pterodactyl\Repositories\Eloquent\NodeRepository;
 use Pterodactyl\Repositories\Eloquent\ServerRepository;
+use Pterodactyl\Repositories\Wings\DaemonServerRepository;
 use Pterodactyl\Repositories\Wings\DaemonTransferRepository;
 use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
 use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
@@ -42,6 +43,11 @@ class ServerTransferController extends Controller
      */
     private $nodeRepository;
 
+    /**
+     * @var \Pterodactyl\Repositories\Wings\DaemonServerRepository
+     */
+    private $daemonServerRepository;
+
     /**
      * @var \Pterodactyl\Repositories\Wings\DaemonTransferRepository
      */
@@ -57,6 +63,11 @@ class ServerTransferController extends Controller
      */
     private $suspensionService;
 
+    /**
+     * @var \Psr\Log\LoggerInterface
+     */
+    private $writer;
+
     /**
      * ServerTransferController constructor.
      *
@@ -64,26 +75,32 @@ class ServerTransferController extends Controller
      * @param \Pterodactyl\Repositories\Eloquent\ServerRepository $repository
      * @param \Pterodactyl\Contracts\Repository\AllocationRepositoryInterface $allocationRepository
      * @param \Pterodactyl\Repositories\Eloquent\NodeRepository $nodeRepository
+     * @param \Pterodactyl\Repositories\Wings\DaemonServerRepository $daemonServerRepository
      * @param \Pterodactyl\Repositories\Wings\DaemonTransferRepository $daemonTransferRepository
      * @param \Pterodactyl\Services\Servers\ServerConfigurationStructureService $configurationStructureService
      * @param \Pterodactyl\Services\Servers\SuspensionService $suspensionService
+     * @param \Psr\Log\LoggerInterface $writer
      */
     public function __construct(
         ConnectionInterface $connection,
         ServerRepository $repository,
         AllocationRepositoryInterface $allocationRepository,
         NodeRepository $nodeRepository,
+        DaemonServerRepository $daemonServerRepository,
         DaemonTransferRepository $daemonTransferRepository,
         ServerConfigurationStructureService $configurationStructureService,
-        SuspensionService $suspensionService
+        SuspensionService $suspensionService,
+        LoggerInterface $writer
     ) {
         $this->connection = $connection;
         $this->repository = $repository;
         $this->allocationRepository = $allocationRepository;
         $this->nodeRepository = $nodeRepository;
+        $this->daemonServerRepository = $daemonServerRepository;
         $this->daemonTransferRepository = $daemonTransferRepository;
         $this->configurationStructureService = $configurationStructureService;
         $this->suspensionService = $suspensionService;
+        $this->writer = $writer;
     }
 
     /**
@@ -162,15 +179,9 @@ class ServerTransferController extends Controller
         $allocationIds = json_decode($transfer->new_additional_allocations);
         array_push($allocationIds, $transfer->new_allocation);
 
-        // Begin a transaction.
-        $this->connection->beginTransaction();
-
         // Remove the new allocations.
         $this->allocationRepository->updateWhereIn('id', $allocationIds, ['server_id' => null]);
 
-        // Commit the transaction.
-        $this->connection->commit();
-
         // Unsuspend the server.
         $this->suspensionService->toggle($server, 'unsuspend');
 
@@ -190,8 +201,6 @@ class ServerTransferController extends Controller
         $server = $this->repository->getByUuid($uuid);
         $transfer = $server->transfer;
 
-        // TODO: Notify old daemon about transfer and get it to remove server files.
-
         $allocationIds = json_decode($transfer->old_additional_allocations);
         array_push($allocationIds, $transfer->old_allocation);
 
@@ -213,11 +222,15 @@ class ServerTransferController extends Controller
         // Commit the transaction.
         $this->connection->commit();
 
+        // Delete the server from the old node
+        try {
+            $this->daemonServerRepository->setServer($server)->delete();
+        } catch (DaemonConnectionException $exception) {
+            $this->writer->warning($exception);
+        }
+
         // Unsuspend the server
         $server->load('node');
-        Log::debug(json_encode($server));
-        Log::debug(json_encode($server->node_id));
-        Log::debug(json_encode($server->node));
         $this->suspensionService->toggle($server, $this->suspensionService::ACTION_UNSUSPEND);
 
         return JsonResponse::create([], Response::HTTP_NO_CONTENT);