Update server creation data logic

Author: DaneEveritt

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

@@ -72,9 +72,9 @@ public function index(GetServersRequest $request): array
      * @param \Pterodactyl\Http\Requests\Api\Application\Servers\StoreServerRequest $request
      * @return \Illuminate\Http\JsonResponse
      *
+     * @throws \Throwable
      * @throws \Illuminate\Validation\ValidationException
      * @throws \Pterodactyl\Exceptions\DisplayException
-     * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      * @throws \Pterodactyl\Exceptions\Service\Deployment\NoViableAllocationException

app/Models/Allocation.php

@@ -2,6 +2,22 @@
 
 namespace Pterodactyl\Models;
 
+/**
+ * @property int $id
+ * @property int $node_id
+ * @property string $ip
+ * @property string|null $ip_alias
+ * @property int $port
+ * @property int|null $server_id
+ * @property \Carbon\Carbon|null $created_at
+ * @property \Carbon\Carbon|null $updated_at
+ *
+ * @property string $alias
+ * @property bool $has_alias
+ *
+ * @property \Pterodactyl\Models\Server|null $server
+ * @property \Pterodactyl\Models\Node $node
+ */
 class Allocation extends Validable
 {
     /**

app/Repositories/Wings/DaemonServerRepository.php

@@ -29,4 +29,26 @@ public function getDetails(): array
 
         return json_decode($response->getBody()->__toString(), true);
     }
+
+    /**
+     * Creates a new server on the Wings daemon.
+     *
+     * @param array $data
+     *
+     * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
+     */
+    public function create(array $data): void
+    {
+        Assert::isInstanceOf($this->server, Server::class);
+
+        try {
+            $this->getHttpClient()->post(
+                '/api/servers', [
+                    'json' => $data,
+                ]
+            );
+        } catch (TransferException $exception) {
+            throw new DaemonConnectionException($exception);
+        }
+    }
 }

app/Services/Eggs/EggConfigurationService.php

@@ -107,7 +107,7 @@ protected function replacePlaceholders(Server $server, object $configs)
     {
         // Get the legacy configuration structure for the server so that we
         // can property map the egg placeholders to values.
-        $structure = $this->configurationStructureService->handle($server);
+        $structure = $this->configurationStructureService->handle($server, true);
 
         foreach ($configs as $file => $data) {
             foreach ($data->find ?? [] as &$value) {

app/Services/Servers/ServerConfigurationStructureService.php

@@ -47,14 +47,76 @@ public function __construct(
      * daemon, if you modify the structure eggs will break unexpectedly.
      *
      * @param \Pterodactyl\Models\Server $server
+     * @param bool $legacy
      * @return array
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function handle(Server $server): array
+    public function handle(Server $server, bool $legacy = false): array
     {
         $server->loadMissing(self::REQUIRED_RELATIONS);
 
+        return $legacy ?
+            $this->returnLegacyFormat($server)
+            : $this->returnCurrentFormat($server);
+    }
+
+    /**
+     * Returns the new data format used for the Wings daemon.
+     *
+     * @param \Pterodactyl\Models\Server $server
+     * @return array
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    protected function returnCurrentFormat(Server $server)
+    {
+        return [
+            'uuid' => $server->uuid,
+            'suspended' => $server->suspended,
+            'environment' => $this->environment->handle($server),
+            'build' => [
+                'oom_disabled' => $server->oom_disabled,
+                'memory' => $server->memory,
+                'swap' => $server->swap,
+                'io' => $server->io,
+                'cpu' => $server->cpu,
+                'disk' => $server->disk,
+            ],
+            'service' => [
+                'egg' => $server->egg->uuid,
+                'pack' => $server->pack ? $server->pack->uuid : null,
+                'skip_scripts' => $server->skip_scripts,
+            ],
+            'container' => [
+                'image' => $server->image,
+                'requires_rebuild' => false,
+            ],
+            'allocations' => [
+                'default' => [
+                    'ip' => $server->allocation->ip,
+                    'port' => $server->allocation->port,
+                ],
+                'mappings' => [
+                    $server->allocations->groupBy('ip')->map(function ($item) {
+                        return $item->pluck('port');
+                    })->toArray(),
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Returns the legacy server data format to continue support for old egg configurations
+     * that have not yet been updated.
+     *
+     * @param \Pterodactyl\Models\Server $server
+     * @return array
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    protected function returnLegacyFormat(Server $server)
+    {
         return [
             'uuid' => $server->uuid,
             'build' => [