Merge pull request #678 from Pterodactyl/feature/service-export-import

Overhaul service system and add ability to export/import them.

.env.example

@@ -32,6 +32,4 @@ QUEUE_HIGH=high
 QUEUE_STANDARD=standard
 QUEUE_LOW=low
 
-SQS_KEY=aws-public
-SQS_SECRET=aws-secret
-SQS_QUEUE_PREFIX=aws-queue-prefix
+SERVICE_AUTHOR=undefined@unknown-author.com

.travis.yml

@@ -15,7 +15,7 @@ before_install:
 before_script:
   - cp .env.travis .env
   - composer install --no-interaction --prefer-dist --no-suggest --verbose
-  - php artisan migrate --seed -v
+  - php artisan migrate -v
 script:
   - vendor/bin/phpunit --coverage-clover coverage.xml
 notifications:

CHANGELOG.md

@@ -12,6 +12,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 * New CLI command to disabled 2-Factor Authentication on an account if necessary.
 * Ability to delete users and locations via the CLI.
 * You can now require 2FA for all users, admins only, or at will using a simple configuration in the Admin CP.
+* Added ability to export and import service options and their associated settings and environment variables via the Admin CP.
 
 ### Changed
 * Theme colors and login pages updated to give a more unique feel to the project.

app/Console/Commands/Environment/AppSettingsCommand.php

@@ -9,7 +9,6 @@
 
 namespace Pterodactyl\Console\Commands\Environment;
 
-use Ramsey\Uuid\Uuid;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Console\Kernel;
 use Pterodactyl\Traits\Commands\EnvironmentWriterTrait;
@@ -38,6 +37,7 @@ class AppSettingsCommand extends Command
      * @var string
      */
     protected $signature = 'p:environment:setup
+                            {--author= : The email that services created on this instance should be linked to.}
                             {--url= : The URL that this Panel is running on.}
                             {--timezone= : The timezone to use for Panel times.}
                             {--cache= : The cache driver backend to use.}
@@ -72,9 +72,10 @@ class AppSettingsCommand extends Command
      */
     public function handle()
     {
-        if (is_null($this->config->get('pterodactyl.service.author'))) {
-            $this->variables['SERVICE_AUTHOR'] = Uuid::uuid4()->toString();
-        }
+        $this->output->comment(trans('command/messages.environment.app.author_help'));
+        $this->variables['SERVICE_AUTHOR'] = $this->option('author') ?? $this->ask(
+            trans('command/messages.environment.app.author'), $this->config->get('pterodactyl.service.author', 'undefined@unknown-author.com')
+        );
 
         $this->output->comment(trans('command/messages.environment.app.app_url_help'));
         $this->variables['APP_URL'] = $this->option('url') ?? $this->ask(

app/Console/Commands/Server/RebuildServerCommand.php

@@ -12,12 +12,17 @@ namespace Pterodactyl\Console\Commands\Server;
 use Webmozart\Assert\Assert;
 use Illuminate\Console\Command;
 use GuzzleHttp\Exception\RequestException;
-use Pterodactyl\Services\Servers\EnvironmentService;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
+use Pterodactyl\Services\Servers\ServerConfigurationStructureService;
 use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
 
 class RebuildServerCommand extends Command
 {
+    /**
+     * @var \Pterodactyl\Services\Servers\ServerConfigurationStructureService
+     */
+    protected $configurationStructureService;
+
     /**
      * @var \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface
      */
@@ -28,11 +33,6 @@ class RebuildServerCommand extends Command
      */
     protected $description = 'Rebuild a single server, all servers on a node, or all servers on the panel.';
 
-    /**
-     * @var \Pterodactyl\Services\Servers\EnvironmentService
-     */
-    protected $environmentService;
-
     /**
      * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
      */
@@ -49,18 +49,18 @@ class RebuildServerCommand extends Command
      * RebuildServerCommand constructor.
      *
      * @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface $daemonRepository
-     * @param \Pterodactyl\Services\Servers\EnvironmentService                   $environmentService
+     * @param \Pterodactyl\Services\Servers\ServerConfigurationStructureService  $configurationStructureService
      * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface        $repository
      */
     public function __construct(
         DaemonServerRepositoryInterface $daemonRepository,
-        EnvironmentService $environmentService,
+        ServerConfigurationStructureService $configurationStructureService,
         ServerRepositoryInterface $repository
     ) {
         parent::__construct();
 
+        $this->configurationStructureService = $configurationStructureService;
         $this->daemonRepository = $daemonRepository;
-        $this->environmentService = $environmentService;
         $this->repository = $repository;
     }
 
@@ -74,19 +74,7 @@ class RebuildServerCommand extends Command
 
         $servers->each(function ($server) use ($bar) {
             $bar->clear();
-            $json = [
-                'build' => [
-                    'image' => $server->image,
-                    'env|overwrite' => $this->environmentService->process($server),
-                ],
-                'service' => [
-                    'type' => $server->option->service->folder,
-                    'option' => $server->option->tag,
-                    'pack' => object_get($server, 'pack.uuid'),
-                    'skip_scripts' => $server->skip_scripts,
-                ],
-                'rebuild' => true,
-            ];
+            $json = array_merge($this->configurationStructureService->handle($server), ['rebuild' => true]);
 
             try {
                 $this->daemonRepository->setNode($server->node_id)->setAccessServer($server->uuid)->update($json);

app/Contracts/Repository/Daemon/ServerRepositoryInterface.php

@@ -9,17 +9,20 @@
 
 namespace Pterodactyl\Contracts\Repository\Daemon;
 
+use Psr\Http\Message\ResponseInterface;
+
 interface ServerRepositoryInterface extends BaseRepositoryInterface
 {
     /**
      * Create a new server on the daemon for the panel.
      *
-     * @param int   $id
+     * @param array $structure
      * @param array $overrides
-     * @param bool  $start
      * @return \Psr\Http\Message\ResponseInterface
+     *
+     * @throws \GuzzleHttp\Exception\RequestException
      */
-    public function create($id, array $overrides = [], $start = false);
+    public function create(array $structure, array $overrides = []): ResponseInterface;
 
     /**
      * Update server details on the daemon.

app/Contracts/Repository/EggRepositoryInterface.php

@@ -0,0 +1,61 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Contracts\Repository;
+
+use Pterodactyl\Models\Egg;
+use Illuminate\Database\Eloquent\Collection;
+
+interface EggRepositoryInterface extends RepositoryInterface
+{
+    /**
+     * Return an egg with the variables relation attached.
+     *
+     * @param int $id
+     * @return \Pterodactyl\Models\Egg
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function getWithVariables(int $id): Egg;
+
+    /**
+     * Return all eggs and their relations to be used in the daemon API.
+     *
+     * @return \Illuminate\Database\Eloquent\Collection
+     */
+    public function getAllWithCopyAttributes(): Collection;
+
+    /**
+     * Return an egg with the scriptFrom and configFrom relations loaded onto the model.
+     *
+     * @param int|string $value
+     * @param string     $column
+     * @return \Pterodactyl\Models\Egg
+     */
+    public function getWithCopyAttributes($value, string $column = 'id'): Egg;
+
+    /**
+     * Return all of the data needed to export a service.
+     *
+     * @param int $id
+     * @return \Pterodactyl\Models\Egg
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function getWithExportAttributes(int $id): Egg;
+
+    /**
+     * Confirm a copy script belongs to the same nest as the item trying to use it.
+     *
+     * @param int $copyFromId
+     * @param int $service
+     * @return bool
+     */
+    public function isCopiableScript(int $copyFromId, int $service): bool;
+}

app/Contracts/Repository/EggVariableRepositoryInterface.php

@@ -9,6 +9,6 @@
 
 namespace Pterodactyl\Contracts\Repository;
 
-interface OptionVariableRepositoryInterface extends RepositoryInterface
+interface EggVariableRepositoryInterface extends RepositoryInterface
 {
 }

app/Contracts/Repository/NestRepositoryInterface.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Contracts\Repository;
+
+use Pterodactyl\Models\Nest;
+
+interface NestRepositoryInterface extends RepositoryInterface
+{
+    /**
+     * Return a nest or all nests with their associated eggs, variables, and packs.
+     *
+     * @param int $id
+     * @return \Illuminate\Database\Eloquent\Collection|\Pterodactyl\Models\Nest
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function getWithEggs(int $id = null);
+
+    /**
+     * Return a nest or all nests and the count of eggs, packs, and servers for that nest.
+     *
+     * @param int|null $id
+     * @return \Pterodactyl\Models\Nest|\Illuminate\Database\Eloquent\Collection
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function getWithCounts(int $id = null);
+
+    /**
+     * Return a nest along with its associated eggs and the servers relation on those eggs.
+     *
+     * @param int $id
+     * @return \Pterodactyl\Models\Nest
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function getWithEggServers(int $id): Nest;
+}

app/Contracts/Repository/PackRepositoryInterface.php

@@ -14,12 +14,12 @@ use Pterodactyl\Contracts\Repository\Attributes\SearchableInterface;
 interface PackRepositoryInterface extends RepositoryInterface, SearchableInterface
 {
     /**
-     * Return a paginated listing of packs with their associated option and server count.
+     * Return a paginated listing of packs with their associated egg and server count.
      *
      * @param int $paginate
      * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
      */
-    public function paginateWithOptionAndServerCount($paginate = 50);
+    public function paginateWithEggAndServerCount($paginate = 50);
 
     /**
      * Return a pack with the associated server models attached to it.

app/Contracts/Repository/ServiceOptionRepositoryInterface.php

@@ -1,38 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Contracts\Repository;
-
-interface ServiceOptionRepositoryInterface extends RepositoryInterface
-{
-    /**
-     * Return a service option with the variables relation attached.
-     *
-     * @param int $id
-     * @return mixed
-     */
-    public function getWithVariables($id);
-
-    /**
-     * Return a service option with the copyFrom relation loaded onto the model.
-     *
-     * @param int $id
-     * @return mixed
-     */
-    public function getWithCopyFrom($id);
-
-    /**
-     * Confirm a copy script belongs to the same service as the item trying to use it.
-     *
-     * @param int $copyFromId
-     * @param int $service
-     * @return bool
-     */
-    public function isCopiableScript($copyFromId, $service);
-}

app/Contracts/Repository/ServiceRepositoryInterface.php

@@ -1,29 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Contracts\Repository;
-
-interface ServiceRepositoryInterface extends RepositoryInterface
-{
-    /**
-     * Return a service or all services with their associated options, variables, and packs.
-     *
-     * @param int $id
-     * @return \Illuminate\Support\Collection
-     */
-    public function getWithOptions($id = null);
-
-    /**
-     * Return a service along with its associated options and the servers relation on those options.
-     *
-     * @param int $id
-     * @return mixed
-     */
-    public function getWithOptionServers($id);
-}

app/Contracts/Repository/ServiceVariableRepositoryInterface.php

@@ -1,14 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Contracts\Repository;
-
-interface ServiceVariableRepositoryInterface extends RepositoryInterface
-{
-}

app/Exceptions/DisplayException.php

@@ -14,6 +14,9 @@ use Throwable;
 
 class DisplayException extends PterodactylException
 {
+    const LEVEL_WARNING = 'warning';
+    const LEVEL_ERROR = 'error';
+
     /**
      * @var string
      */
@@ -27,7 +30,7 @@ class DisplayException extends PterodactylException
      * @param string         $level
      * @internal param mixed $log
      */
-    public function __construct($message, Throwable $previous = null, $level = 'error')
+    public function __construct($message, Throwable $previous = null, $level = self::LEVEL_ERROR)
     {
         $this->level = $level;
 

app/Exceptions/Http/Connection/DaemonConnectionException.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Exceptions\Http\Connection;
+
+use GuzzleHttp\Exception\GuzzleException;
+use Pterodactyl\Exceptions\DisplayException;
+
+class DaemonConnectionException extends DisplayException
+{
+    /**
+     * Throw a displayable exception caused by a daemon connection error.
+     *
+     * @param \GuzzleHttp\Exception\GuzzleException $previous
+     */
+    public function __construct(GuzzleException $previous)
+    {
+        /** @var \GuzzleHttp\Psr7\Response|null $response */
+        $response = method_exists($previous, 'getResponse') ? $previous->getResponse() : null;
+
+        parent::__construct(trans('admin/server.exceptions.daemon_exception', [
+            'code' => is_null($response) ? 'E_CONN_REFUSED' : $response->getStatusCode(),
+        ]), $previous, DisplayException::LEVEL_WARNING);
+    }
+}

app/Exceptions/Service/Egg/BadJsonFormatException.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Pterodactyl\Exceptions\Service\Egg;
+
+use Pterodactyl\Exceptions\DisplayException;
+
+class BadJsonFormatException extends DisplayException
+{
+}

app/Exceptions/Service/Egg/HasChildrenException.php

@@ -7,7 +7,7 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Exceptions\Service\ServiceOption;
+namespace Pterodactyl\Exceptions\Service\Egg;
 
 use Pterodactyl\Exceptions\DisplayException;
 

app/Exceptions/Service/Egg/InvalidCopyFromException.php

@@ -7,10 +7,10 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Exceptions\Service\ServiceVariable;
+namespace Pterodactyl\Exceptions\Service\Egg;
 
-use Exception;
+use Pterodactyl\Exceptions\DisplayException;
 
-class ReservedVariableNameException extends Exception
+class InvalidCopyFromException extends DisplayException
 {
 }

app/Exceptions/Service/Egg/NoParentConfigurationFoundException.php

@@ -7,8 +7,10 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Exceptions\Service\ServiceOption;
+namespace Pterodactyl\Exceptions\Service\Egg;
 
-class NoParentConfigurationFoundException extends \Exception
+use Pterodactyl\Exceptions\DisplayException;
+
+class NoParentConfigurationFoundException extends DisplayException
 {
 }

app/Exceptions/Service/Egg/Variable/ReservedVariableNameException.php

@@ -7,8 +7,10 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Exceptions\Service\ServiceOption;
+namespace Pterodactyl\Exceptions\Service\Egg\Variable;
 
-class InvalidCopyFromException extends \Exception
+use Pterodactyl\Exceptions\DisplayException;
+
+class ReservedVariableNameException extends DisplayException
 {
 }

app/Exceptions/Service/InvalidFileUploadException.php

@@ -7,7 +7,7 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Exceptions\Service\Pack;
+namespace Pterodactyl\Exceptions\Service;
 
 use Pterodactyl\Exceptions\DisplayException;
 

app/Http/Controllers/API/Admin/LocationController.php

@@ -1,36 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Controllers\API\Admin;
-
-use Fractal;
-use Illuminate\Http\Request;
-use Pterodactyl\Models\Location;
-use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Transformers\Admin\LocationTransformer;
-
-class LocationController extends Controller
-{
-    /**
-     * Controller to handle returning all locations on the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function index(Request $request)
-    {
-        $this->authorize('location-list', $request->apiKey());
-
-        return Fractal::create()
-            ->collection(Location::all())
-            ->transformWith(new LocationTransformer($request))
-            ->withResourceName('location')
-            ->toArray();
-    }
-}

app/Http/Controllers/API/Admin/NodeController.php

@@ -1,159 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Controllers\API\Admin;
-
-use Log;
-use Fractal;
-use Illuminate\Http\Request;
-use Pterodactyl\Models\Node;
-use Pterodactyl\Exceptions\DisplayException;
-use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Repositories\NodeRepository;
-use Pterodactyl\Transformers\Admin\NodeTransformer;
-use Pterodactyl\Exceptions\DisplayValidationException;
-use League\Fractal\Pagination\IlluminatePaginatorAdapter;
-
-class NodeController extends Controller
-{
-    /**
-     * Controller to handle returning all nodes on the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function index(Request $request)
-    {
-        $this->authorize('node-list', $request->apiKey());
-
-        $nodes = Node::paginate(config('pterodactyl.paginate.api.nodes'));
-        $fractal = Fractal::create()->collection($nodes)
-            ->transformWith(new NodeTransformer($request))
-            ->withResourceName('user')
-            ->paginateWith(new IlluminatePaginatorAdapter($nodes));
-
-        if (config('pterodactyl.api.include_on_list') && $request->input('include')) {
-            $fractal->parseIncludes(explode(',', $request->input('include')));
-        }
-
-        return $fractal->toArray();
-    }
-
-    /**
-     * Display information about a single node on the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return array
-     */
-    public function view(Request $request, $id)
-    {
-        $this->authorize('node-view', $request->apiKey());
-
-        $fractal = Fractal::create()->item(Node::findOrFail($id));
-        if ($request->input('include')) {
-            $fractal->parseIncludes(explode(',', $request->input('include')));
-        }
-
-        return $fractal->transformWith(new NodeTransformer($request))
-            ->withResourceName('node')
-            ->toArray();
-    }
-
-    /**
-     * Display information about a single node on the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function viewConfig(Request $request, $id)
-    {
-        $this->authorize('node-view-config', $request->apiKey());
-
-        $node = Node::findOrFail($id);
-
-        return response()->json(json_decode($node->getConfigurationAsJson()));
-    }
-
-    /**
-     * Create a new node on the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\JsonResponse|array
-     */
-    public function store(Request $request)
-    {
-        $this->authorize('node-create', $request->apiKey());
-
-        $repo = new NodeRepository;
-        try {
-            $node = $repo->create(array_merge(
-                $request->only([
-                    'public', 'disk_overallocate', 'memory_overallocate',
-                ]),
-                $request->intersect([
-                    'name', 'location_id', 'fqdn',
-                    'scheme', 'memory', 'disk',
-                    'daemonBase', 'daemonSFTP', 'daemonListen',
-                ])
-            ));
-
-            $fractal = Fractal::create()->item($node)->transformWith(new NodeTransformer($request));
-            if ($request->input('include')) {
-                $fractal->parseIncludes(explode(',', $request->input('include')));
-            }
-
-            return $fractal->withResourceName('node')->toArray();
-        } catch (DisplayValidationException $ex) {
-            return response()->json([
-                'error' => json_decode($ex->getMessage()),
-            ], 400);
-        } catch (DisplayException $ex) {
-            return response()->json([
-                'error' => $ex->getMessage(),
-            ], 400);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to create this node. Please try again.',
-            ], 500);
-        }
-    }
-
-    /**
-     * Delete a node from the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse
-     */
-    public function delete(Request $request, $id)
-    {
-        $this->authorize('node-delete', $request->apiKey());
-
-        $repo = new NodeRepository;
-        try {
-            $repo->delete($id);
-
-            return response('', 204);
-        } catch (DisplayException $ex) {
-            return response()->json([
-                'error' => $ex->getMessage(),
-            ], 400);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to delete this node. Please try again.',
-            ], 500);
-        }
-    }
-}

app/Http/Controllers/API/Admin/ServerController.php

@@ -1,414 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Controllers\API\Admin;
-
-use Log;
-use Fractal;
-use Illuminate\Http\Request;
-use Pterodactyl\Models\Server;
-use GuzzleHttp\Exception\TransferException;
-use Pterodactyl\Exceptions\DisplayException;
-use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Repositories\ServerRepository;
-use Pterodactyl\Transformers\Admin\ServerTransformer;
-use Pterodactyl\Exceptions\DisplayValidationException;
-use League\Fractal\Pagination\IlluminatePaginatorAdapter;
-
-class ServerController extends Controller
-{
-    /**
-     * Controller to handle returning all servers on the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function index(Request $request)
-    {
-        $this->authorize('server-list', $request->apiKey());
-
-        $servers = Server::paginate(config('pterodactyl.paginate.api.servers'));
-        $fractal = Fractal::create()->collection($servers)
-            ->transformWith(new ServerTransformer($request))
-            ->withResourceName('user')
-            ->paginateWith(new IlluminatePaginatorAdapter($servers));
-
-        if (config('pterodactyl.api.include_on_list') && $request->input('include')) {
-            $fractal->parseIncludes(explode(',', $request->input('include')));
-        }
-
-        return $fractal->toArray();
-    }
-
-    /**
-     * Controller to handle returning information on a single server.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return array
-     */
-    public function view(Request $request, $id)
-    {
-        $this->authorize('server-view', $request->apiKey());
-
-        $server = Server::findOrFail($id);
-        $fractal = Fractal::create()->item($server);
-
-        if ($request->input('include')) {
-            $fractal->parseIncludes(explode(',', $request->input('include')));
-        }
-
-        return $fractal->transformWith(new ServerTransformer($request))
-            ->withResourceName('server')
-            ->toArray();
-    }
-
-    /**
-     * Create a new server on the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\JsonResponse|array
-     */
-    public function store(Request $request)
-    {
-        $this->authorize('server-create', $request->apiKey());
-
-        $repo = new ServerRepository;
-        try {
-            $server = $repo->create($request->all());
-
-            $fractal = Fractal::create()->item($server)->transformWith(new ServerTransformer($request));
-            if ($request->input('include')) {
-                $fractal->parseIncludes(explode(',', $request->input('include')));
-            }
-
-            return $fractal->withResourceName('server')->toArray();
-        } catch (DisplayValidationException $ex) {
-            return response()->json([
-                'error' => json_decode($ex->getMessage()),
-            ], 400);
-        } catch (DisplayException $ex) {
-            return response()->json([
-                'error' => $ex->getMessage(),
-            ], 400);
-        } catch (TransferException $ex) {
-            Log::warning($ex);
-
-            return response()->json([
-                'error' => 'A TransferException was encountered while trying to contact the daemon, please ensure it is online and accessible. This error has been logged.',
-            ], 504);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to add this server. Please try again.',
-            ], 500);
-        }
-    }
-
-    /**
-     * Delete a server from the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse
-     */
-    public function delete(Request $request, $id)
-    {
-        $this->authorize('server-delete', $request->apiKey());
-
-        $repo = new ServerRepository;
-        try {
-            $repo->delete($id, $request->has('force_delete'));
-
-            return response('', 204);
-        } catch (DisplayException $ex) {
-            return response()->json([
-                'error' => $ex->getMessage(),
-            ], 400);
-        } catch (TransferException $ex) {
-            Log::warning($ex);
-
-            return response()->json([
-                'error' => 'A TransferException was encountered while trying to contact the daemon, please ensure it is online and accessible. This error has been logged.',
-            ], 504);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to add this server. Please try again.',
-            ], 500);
-        }
-    }
-
-    /**
-     * Update the details for a server.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return \Illuminate\Http\JsonResponse|array
-     */
-    public function details(Request $request, $id)
-    {
-        $this->authorize('server-edit-details', $request->apiKey());
-
-        $repo = new ServerRepository;
-        try {
-            $server = $repo->updateDetails($id, $request->intersect([
-                'owner_id', 'name', 'description', 'reset_token',
-            ]));
-
-            $fractal = Fractal::create()->item($server)->transformWith(new ServerTransformer($request));
-            if ($request->input('include')) {
-                $fractal->parseIncludes(explode(',', $request->input('include')));
-            }
-
-            return $fractal->withResourceName('server')->toArray();
-        } catch (DisplayValidationException $ex) {
-            return response()->json([
-                'error' => json_decode($ex->getMessage()),
-            ], 400);
-        } catch (DisplayException $ex) {
-            return response()->json([
-                'error' => $ex->getMessage(),
-            ], 400);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to modify this server. Please try again.',
-            ], 500);
-        }
-    }
-
-    /**
-     * Set the new docker container for a server.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return \Illuminate\Http\RedirectResponse|array
-     */
-    public function container(Request $request, $id)
-    {
-        $this->authorize('server-edit-container', $request->apiKey());
-
-        $repo = new ServerRepository;
-        try {
-            $server = $repo->updateContainer($id, $request->intersect('docker_image'));
-
-            $fractal = Fractal::create()->item($server)->transformWith(new ServerTransformer($request));
-            if ($request->input('include')) {
-                $fractal->parseIncludes(explode(',', $request->input('include')));
-            }
-
-            return $fractal->withResourceName('server')->toArray();
-        } catch (DisplayValidationException $ex) {
-            return response()->json([
-                'error' => json_decode($ex->getMessage()),
-            ], 400);
-        } catch (TransferException $ex) {
-            Log::warning($ex);
-
-            return response()->json([
-                'error' => 'A TransferException was encountered while trying to contact the daemon, please ensure it is online and accessible. This error has been logged.',
-            ], 504);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to modify this server container. Please try again.',
-            ], 500);
-        }
-    }
-
-    /**
-     * Toggles the install status for a server.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse
-     */
-    public function install(Request $request, $id)
-    {
-        $this->authorize('server-install', $request->apiKey());
-
-        $repo = new ServerRepository;
-        try {
-            $repo->toggleInstall($id);
-
-            return response('', 204);
-        } catch (DisplayException $ex) {
-            return response()->json([
-                'error' => $ex->getMessage(),
-            ], 400);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to toggle the install status for this server. Please try again.',
-            ], 500);
-        }
-    }
-
-    /**
-     * Setup a server to have a container rebuild.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse
-     */
-    public function rebuild(Request $request, $id)
-    {
-        $this->authorize('server-rebuild', $request->apiKey());
-        $server = Server::with('node')->findOrFail($id);
-
-        try {
-            $server->node->guzzleClient([
-                'X-Access-Server' => $server->uuid,
-                'X-Access-Token' => $server->node->daemonSecret,
-            ])->request('POST', '/server/rebuild');
-
-            return response('', 204);
-        } catch (TransferException $ex) {
-            Log::warning($ex);
-
-            return response()->json([
-                'error' => 'A TransferException was encountered while trying to contact the daemon, please ensure it is online and accessible. This error has been logged.',
-            ], 504);
-        }
-    }
-
-    /**
-     * Manage the suspension status for a server.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse
-     */
-    public function suspend(Request $request, $id)
-    {
-        $this->authorize('server-suspend', $request->apiKey());
-
-        $repo = new ServerRepository;
-        $action = $request->input('action');
-        if (! in_array($action, ['suspend', 'unsuspend'])) {
-            return response()->json([
-                'error' => 'The action provided was invalid. Action should be one of: suspend, unsuspend.',
-            ], 400);
-        }
-
-        try {
-            $repo->toggleAccess($id, ($action === 'unsuspend'));
-
-            return response('', 204);
-        } catch (DisplayException $ex) {
-            return response()->json([
-                'error' => $ex->getMessage(),
-            ], 400);
-        } catch (TransferException $ex) {
-            Log::warning($ex);
-
-            return response()->json([
-                'error' => 'A TransferException was encountered while trying to contact the daemon, please ensure it is online and accessible. This error has been logged.',
-            ], 504);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to ' . $action . ' this server. Please try again.',
-            ], 500);
-        }
-    }
-
-    /**
-     * Update the build configuration for a server.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return \Illuminate\Http\JsonResponse|array
-     */
-    public function build(Request $request, $id)
-    {
-        $this->authorize('server-edit-build', $request->apiKey());
-
-        $repo = new ServerRepository;
-        try {
-            $server = $repo->changeBuild($id, $request->intersect([
-                'allocation_id', 'add_allocations', 'remove_allocations',
-                'memory', 'swap', 'io', 'cpu',
-            ]));
-
-            $fractal = Fractal::create()->item($server)->transformWith(new ServerTransformer($request));
-            if ($request->input('include')) {
-                $fractal->parseIncludes(explode(',', $request->input('include')));
-            }
-
-            return $fractal->withResourceName('server')->toArray();
-        } catch (DisplayValidationException $ex) {
-            return response()->json([
-                'error' => json_decode($ex->getMessage()),
-            ], 400);
-        } catch (DisplayException $ex) {
-            return response()->json([
-                'error' => $ex->getMessage(),
-            ], 400);
-        } catch (TransferException $ex) {
-            Log::warning($ex);
-
-            return response()->json([
-                'error' => 'A TransferException was encountered while trying to contact the daemon, please ensure it is online and accessible. This error has been logged.',
-            ], 504);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to modify the build settings for this server. Please try again.',
-            ], 500);
-        }
-    }
-
-    /**
-     * Update the startup command as well as variables.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse
-     */
-    public function startup(Request $request, $id)
-    {
-        $this->authorize('server-edit-startup', $request->apiKey());
-
-        $repo = new ServerRepository;
-        try {
-            $repo->updateStartup($id, $request->all(), true);
-
-            return response('', 204);
-        } catch (DisplayValidationException $ex) {
-            return response()->json([
-                'error' => json_decode($ex->getMessage()),
-            ], 400);
-        } catch (DisplayException $ex) {
-            return response()->json([
-                'error' => $ex->getMessage(),
-            ], 400);
-        } catch (TransferException $ex) {
-            Log::warning($ex);
-
-            return response()->json([
-                'error' => 'A TransferException was encountered while trying to contact the daemon, please ensure it is online and accessible. This error has been logged.',
-            ], 504);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to modify the startup settings for this server. Please try again.',
-            ], 500);
-        }
-    }
-}

app/Http/Controllers/API/Admin/ServiceController.php

@@ -1,59 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Controllers\API\Admin;
-
-use Fractal;
-use Illuminate\Http\Request;
-use Pterodactyl\Models\Service;
-use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Transformers\Admin\ServiceTransformer;
-
-class ServiceController extends Controller
-{
-    /**
-     * Controller to handle returning all locations on the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function index(Request $request)
-    {
-        $this->authorize('service-list', $request->apiKey());
-
-        return Fractal::create()
-            ->collection(Service::all())
-            ->transformWith(new ServiceTransformer($request))
-            ->withResourceName('service')
-            ->toArray();
-    }
-
-    /**
-     * Controller to handle returning information on a single server.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return array
-     */
-    public function view(Request $request, $id)
-    {
-        $this->authorize('service-view', $request->apiKey());
-
-        $service = Service::findOrFail($id);
-        $fractal = Fractal::create()->item($service);
-
-        if ($request->input('include')) {
-            $fractal->parseIncludes(explode(',', $request->input('include')));
-        }
-
-        return $fractal->transformWith(new ServiceTransformer($request))
-            ->withResourceName('service')
-            ->toArray();
-    }
-}

app/Http/Controllers/API/Admin/UserController.php

@@ -1,170 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Controllers\API\Admin;
-
-use Log;
-use Fractal;
-use Illuminate\Http\Request;
-use Pterodactyl\Models\User;
-use Pterodactyl\Exceptions\DisplayException;
-use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Repositories\oldUserRepository;
-use Pterodactyl\Transformers\Admin\UserTransformer;
-use Pterodactyl\Exceptions\DisplayValidationException;
-use League\Fractal\Pagination\IlluminatePaginatorAdapter;
-
-class UserController extends Controller
-{
-    /**
-     * Controller to handle returning all users on the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function index(Request $request)
-    {
-        $this->authorize('user-list', $request->apiKey());
-
-        $users = User::paginate(config('pterodactyl.paginate.api.users'));
-        $fractal = Fractal::create()->collection($users)
-            ->transformWith(new UserTransformer($request))
-            ->withResourceName('user')
-            ->paginateWith(new IlluminatePaginatorAdapter($users));
-
-        if (config('pterodactyl.api.include_on_list') && $request->input('include')) {
-            $fractal->parseIncludes(explode(',', $request->input('include')));
-        }
-
-        return $fractal->toArray();
-    }
-
-    /**
-     * Display information about a single user on the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return array
-     */
-    public function view(Request $request, $id)
-    {
-        $this->authorize('user-view', $request->apiKey());
-
-        $fractal = Fractal::create()->item(User::findOrFail($id));
-        if ($request->input('include')) {
-            $fractal->parseIncludes(explode(',', $request->input('include')));
-        }
-
-        return $fractal->transformWith(new UserTransformer($request))
-            ->withResourceName('user')
-            ->toArray();
-    }
-
-    /**
-     * Create a new user on the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\JsonResponse|array
-     */
-    public function store(Request $request)
-    {
-        $this->authorize('user-create', $request->apiKey());
-
-        $repo = new oldUserRepository;
-        try {
-            $user = $repo->create($request->only([
-                'custom_id', 'email', 'password', 'name_first',
-                'name_last', 'username', 'root_admin',
-            ]));
-
-            $fractal = Fractal::create()->item($user)->transformWith(new UserTransformer($request));
-            if ($request->input('include')) {
-                $fractal->parseIncludes(explode(',', $request->input('include')));
-            }
-
-            return $fractal->withResourceName('user')->toArray();
-        } catch (DisplayValidationException $ex) {
-            return response()->json([
-                'error' => json_decode($ex->getMessage()),
-            ], 400);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to create this user. Please try again.',
-            ], 500);
-        }
-    }
-
-    /**
-     * Update a user.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $user
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function update(Request $request, $user)
-    {
-        $this->authorize('user-edit', $request->apiKey());
-
-        $repo = new oldUserRepository;
-        try {
-            $user = $repo->update($user, $request->intersect([
-                'email', 'password', 'name_first',
-                'name_last', 'username', 'root_admin',
-            ]));
-
-            $fractal = Fractal::create()->item($user)->transformWith(new UserTransformer($request));
-            if ($request->input('include')) {
-                $fractal->parseIncludes(explode(',', $request->input('include')));
-            }
-
-            return $fractal->withResourceName('user')->toArray();
-        } catch (DisplayValidationException $ex) {
-            return response()->json([
-                'error' => json_decode($ex->getMessage()),
-            ], 400);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to update this user. Please try again.',
-            ], 500);
-        }
-    }
-
-    /**
-     * Delete a user from the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse
-     */
-    public function delete(Request $request, $id)
-    {
-        $this->authorize('user-delete', $request->apiKey());
-
-        $repo = new oldUserRepository;
-        try {
-            $repo->delete($id);
-
-            return response('', 204);
-        } catch (DisplayException $ex) {
-            return response()->json([
-                'error' => $ex->getMessage(),
-            ], 400);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to delete this user. Please try again.',
-            ], 500);
-        }
-    }
-}

app/Http/Controllers/API/Remote/EggRetrievalController.php

@@ -0,0 +1,74 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Http\Controllers\API\Remote;
+
+use Illuminate\Http\JsonResponse;
+use Pterodactyl\Http\Controllers\Controller;
+use Pterodactyl\Services\Eggs\EggConfigurationService;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
+
+class EggRetrievalController extends Controller
+{
+    /**
+     * @var \Pterodactyl\Services\Eggs\EggConfigurationService
+     */
+    protected $configurationFileService;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * OptionUpdateController constructor.
+     *
+     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $repository
+     * @param \Pterodactyl\Services\Eggs\EggConfigurationService       $configurationFileService
+     */
+    public function __construct(
+        EggRepositoryInterface $repository,
+        EggConfigurationService $configurationFileService
+    ) {
+        $this->configurationFileService = $configurationFileService;
+        $this->repository = $repository;
+    }
+
+    /**
+     * Return a JSON array of Eggs and the SHA1 hash of thier configuration file.
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function index(): JsonResponse
+    {
+        $eggs = $this->repository->getAllWithCopyAttributes();
+
+        $response = [];
+        $eggs->each(function ($egg) use (&$response) {
+            $response[$egg->uuid] = sha1(json_encode($this->configurationFileService->handle($egg)));
+        });
+
+        return response()->json($response);
+    }
+
+    /**
+     * Return the configuration file for a single Egg for the Daemon.
+     *
+     * @param string $uuid
+     * @return \Illuminate\Http\JsonResponse
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function download(string $uuid): JsonResponse
+    {
+        $option = $this->repository->getWithCopyAttributes($uuid, 'uuid');
+
+        return response()->json($this->configurationFileService->handle($option));
+    }
+}

app/Http/Controllers/API/User/CoreController.php

@@ -1,36 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Controllers\API\User;
-
-use Fractal;
-use Illuminate\Http\Request;
-use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Transformers\User\OverviewTransformer;
-
-class CoreController extends Controller
-{
-    /**
-     * Controller to handle base user request for all of their servers.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function index(Request $request)
-    {
-        $this->authorize('user.server-list', $request->apiKey());
-
-        $servers = $request->user()->access('service', 'node', 'allocation', 'option')->get();
-
-        return Fractal::collection($servers)
-            ->transformWith(new OverviewTransformer)
-            ->withResourceName('server')
-            ->toArray();
-    }
-}

app/Http/Controllers/API/User/ServerController.php

@@ -1,84 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Controllers\API\User;
-
-use Fractal;
-use Illuminate\Http\Request;
-use Pterodactyl\Models\Server;
-use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Transformers\User\ServerTransformer;
-use Pterodactyl\Repositories\old_Daemon\PowerRepository;
-use Pterodactyl\Repositories\old_Daemon\CommandRepository;
-
-class ServerController extends Controller
-{
-    /**
-     * Controller to handle base request for individual server information.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param string                   $uuid
-     * @return array
-     */
-    public function index(Request $request, $uuid)
-    {
-        $this->authorize('user.server-view', $request->apiKey());
-
-        $server = Server::byUuid($uuid);
-        $fractal = Fractal::create()->item($server);
-
-        if ($request->input('include')) {
-            $fractal->parseIncludes(explode(',', $request->input('include')));
-        }
-
-        return $fractal->transformWith(new ServerTransformer)
-            ->withResourceName('server')
-            ->toArray();
-    }
-
-    /**
-     * Controller to handle request for server power toggle.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param string                   $uuid
-     * @return \Illuminate\Http\Response
-     */
-    public function power(Request $request, $uuid)
-    {
-        $this->authorize('user.server-power', $request->apiKey());
-
-        $server = Server::byUuid($uuid);
-        $request->user()->can('power-' . $request->input('action'), $server);
-
-        $repo = new PowerRepository($server, $request->user());
-        $repo->do($request->input('action'));
-
-        return response('', 204)->header('Content-Type', 'application/json');
-    }
-
-    /**
-     * Controller to handle base request for individual server information.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param string                   $uuid
-     * @return \Illuminate\Http\Response
-     */
-    public function command(Request $request, $uuid)
-    {
-        $this->authorize('user.server-command', $request->apiKey());
-
-        $server = Server::byUuid($uuid);
-        $request->user()->can('send-command', $server);
-
-        $repo = new CommandRepository($server, $request->user());
-        $repo->send($request->input('command'));
-
-        return response('', 204)->header('Content-Type', 'application/json');
-    }
-}

app/Http/Controllers/Admin/Nests/EggController.php

@@ -0,0 +1,128 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Http\Controllers\Admin\Nests;
+
+use Javascript;
+use Illuminate\View\View;
+use Pterodactyl\Models\Egg;
+use Illuminate\Http\RedirectResponse;
+use Prologue\Alerts\AlertsMessageBag;
+use Pterodactyl\Http\Controllers\Controller;
+use Pterodactyl\Services\Eggs\EggUpdateService;
+use Pterodactyl\Services\Eggs\EggCreationService;
+use Pterodactyl\Services\Eggs\EggDeletionService;
+use Pterodactyl\Http\Requests\Admin\Egg\EggFormRequest;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
+use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
+
+class EggController extends Controller
+{
+    protected $alert;
+    protected $creationService;
+    protected $deletionService;
+    protected $nestRepository;
+    protected $repository;
+    protected $updateService;
+
+    public function __construct(
+        AlertsMessageBag $alert,
+        EggCreationService $creationService,
+        EggDeletionService $deletionService,
+        EggRepositoryInterface $repository,
+        EggUpdateService $updateService,
+        NestRepositoryInterface $nestRepository
+    ) {
+        $this->alert = $alert;
+        $this->creationService = $creationService;
+        $this->deletionService = $deletionService;
+        $this->nestRepository = $nestRepository;
+        $this->repository = $repository;
+        $this->updateService = $updateService;
+    }
+
+    /**
+     * Handle a request to display the Egg creation page.
+     *
+     * @return \Illuminate\View\View
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function create(): View
+    {
+        $nests = $this->nestRepository->getWithEggs();
+        Javascript::put(['nests' => $nests->keyBy('id')]);
+
+        return view('admin.eggs.new', ['nests' => $nests]);
+    }
+
+    /**
+     * Handle request to store a new Egg.
+     *
+     * @param \Pterodactyl\Http\Requests\Admin\Egg\EggFormRequest $request
+     * @return \Illuminate\Http\RedirectResponse
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\NoParentConfigurationFoundException
+     */
+    public function store(EggFormRequest $request): RedirectResponse
+    {
+        $egg = $this->creationService->handle($request->normalize());
+        $this->alert->success(trans('admin/nests.eggs.notices.egg_created'))->flash();
+
+        return redirect()->route('admin.nests.egg.view', $egg->id);
+    }
+
+    /**
+     * Handle request to view a single Egg.
+     *
+     * @param \Pterodactyl\Models\Egg $egg
+     * @return \Illuminate\View\View
+     */
+    public function view(Egg $egg): View
+    {
+        return view('admin.eggs.view', ['egg' => $egg]);
+    }
+
+    /**
+     * Handle request to update an Egg.
+     *
+     * @param \Pterodactyl\Http\Requests\Admin\Egg\EggFormRequest $request
+     * @param \Pterodactyl\Models\Egg                             $egg
+     * @return \Illuminate\Http\RedirectResponse
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\NoParentConfigurationFoundException
+     */
+    public function update(EggFormRequest $request, Egg $egg): RedirectResponse
+    {
+        $this->updateService->handle($egg, $request->normalize());
+        $this->alert->success(trans('admin/nests.eggs.notices.updated'))->flash();
+
+        return redirect()->route('admin.nests.egg.view', $egg->id);
+    }
+
+    /**
+     * Handle request to destroy an egg.
+     *
+     * @param \Pterodactyl\Models\Egg $egg
+     * @return \Illuminate\Http\RedirectResponse
+     *
+     * @throws \Pterodactyl\Exceptions\Service\Egg\HasChildrenException
+     * @throws \Pterodactyl\Exceptions\Service\HasActiveServersException
+     */
+    public function destroy(Egg $egg): RedirectResponse
+    {
+        $this->deletionService->handle($egg->id);
+        $this->alert->success(trans('admin/nests.eggs.notices.deleted'))->flash();
+
+        return redirect()->route('admin.nests.view', $egg->nest_id);
+    }
+}

app/Http/Controllers/Admin/Nests/EggScriptController.php

@@ -0,0 +1,98 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Http\Controllers\Admin\Nests;
+
+use Illuminate\View\View;
+use Illuminate\Http\RedirectResponse;
+use Prologue\Alerts\AlertsMessageBag;
+use Pterodactyl\Http\Controllers\Controller;
+use Pterodactyl\Services\Eggs\Scripts\InstallScriptService;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
+use Pterodactyl\Http\Requests\Admin\Egg\EggScriptFormRequest;
+
+class EggScriptController extends Controller
+{
+    /**
+     * @var \Prologue\Alerts\AlertsMessageBag
+     */
+    protected $alert;
+
+    /**
+     * @var \Pterodactyl\Services\Eggs\Scripts\InstallScriptService
+     */
+    protected $installScriptService;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * EggScriptController constructor.
+     *
+     * @param \Prologue\Alerts\AlertsMessageBag                        $alert
+     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $repository
+     * @param \Pterodactyl\Services\Eggs\Scripts\InstallScriptService  $installScriptService
+     */
+    public function __construct(
+        AlertsMessageBag $alert,
+        EggRepositoryInterface $repository,
+        InstallScriptService $installScriptService
+    ) {
+        $this->alert = $alert;
+        $this->installScriptService = $installScriptService;
+        $this->repository = $repository;
+    }
+
+    /**
+     * Handle requests to render installation script for an Egg.
+     *
+     * @param int $egg
+     * @return \Illuminate\View\View
+     */
+    public function index(int $egg): View
+    {
+        $egg = $this->repository->getWithCopyAttributes($egg);
+        $copy = $this->repository->findWhere([
+            ['copy_script_from', '=', null],
+            ['nest_id', '=', $egg->nest_id],
+            ['id', '!=', $egg],
+        ]);
+
+        $rely = $this->repository->findWhere([
+            ['copy_script_from', '=', $egg->id],
+        ]);
+
+        return view('admin.eggs.scripts', [
+            'copyFromOptions' => $copy,
+            'relyOnScript' => $rely,
+            'egg' => $egg,
+        ]);
+    }
+
+    /**
+     * Handle a request to update the installation script for an Egg.
+     *
+     * @param \Pterodactyl\Http\Requests\Admin\Egg\EggScriptFormRequest $request
+     * @param int                                                       $egg
+     * @return \Illuminate\Http\RedirectResponse
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\InvalidCopyFromException
+     */
+    public function update(EggScriptFormRequest $request, int $egg): RedirectResponse
+    {
+        $this->installScriptService->handle($egg, $request->normalize());
+        $this->alert->success(trans('admin/nests.eggs.notices.script_updated'))->flash();
+
+        return redirect()->route('admin.nests.egg.scripts', $egg);
+    }
+}

app/Http/Controllers/Admin/Nests/EggShareController.php

@@ -0,0 +1,118 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Http\Controllers\Admin\Nests;
+
+use Pterodactyl\Models\Egg;
+use Illuminate\Http\RedirectResponse;
+use Prologue\Alerts\AlertsMessageBag;
+use Pterodactyl\Http\Controllers\Controller;
+use Symfony\Component\HttpFoundation\Response;
+use Pterodactyl\Services\Eggs\Sharing\EggExporterService;
+use Pterodactyl\Services\Eggs\Sharing\EggImporterService;
+use Pterodactyl\Http\Requests\Admin\Egg\EggImportFormRequest;
+use Pterodactyl\Services\Eggs\Sharing\EggUpdateImporterService;
+
+class EggShareController extends Controller
+{
+    /**
+     * @var \Prologue\Alerts\AlertsMessageBag
+     */
+    protected $alert;
+
+    /**
+     * @var \Pterodactyl\Services\Eggs\Sharing\EggExporterService
+     */
+    protected $exporterService;
+
+    /**
+     * @var \Pterodactyl\Services\Eggs\Sharing\EggImporterService
+     */
+    protected $importerService;
+
+    /**
+     * @var \Pterodactyl\Services\Eggs\Sharing\EggUpdateImporterService
+     */
+    protected $updateImporterService;
+
+    /**
+     * OptionShareController constructor.
+     *
+     * @param \Prologue\Alerts\AlertsMessageBag                           $alert
+     * @param \Pterodactyl\Services\Eggs\Sharing\EggExporterService       $exporterService
+     * @param \Pterodactyl\Services\Eggs\Sharing\EggImporterService       $importerService
+     * @param \Pterodactyl\Services\Eggs\Sharing\EggUpdateImporterService $updateImporterService
+     */
+    public function __construct(
+        AlertsMessageBag $alert,
+        EggExporterService $exporterService,
+        EggImporterService $importerService,
+        EggUpdateImporterService $updateImporterService
+    ) {
+        $this->alert = $alert;
+        $this->exporterService = $exporterService;
+        $this->importerService = $importerService;
+        $this->updateImporterService = $updateImporterService;
+    }
+
+    /**
+     * @param \Pterodactyl\Models\Egg $egg
+     * @return \Symfony\Component\HttpFoundation\Response
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function export(Egg $egg): Response
+    {
+        return response($this->exporterService->handle($egg->id), 200, [
+            'Content-Transfer-Encoding' => 'binary',
+            'Content-Description' => 'File Transfer',
+            'Content-Disposition' => 'attachment; filename=egg-' . kebab_case($egg->name) . '.json',
+            'Content-Type' => 'application/json',
+        ]);
+    }
+
+    /**
+     * Import a new service option using an XML file.
+     *
+     * @param \Pterodactyl\Http\Requests\Admin\Egg\EggImportFormRequest $request
+     * @return \Illuminate\Http\RedirectResponse
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\BadJsonFormatException
+     * @throws \Pterodactyl\Exceptions\Service\InvalidFileUploadException
+     */
+    public function import(EggImportFormRequest $request): RedirectResponse
+    {
+        $egg = $this->importerService->handle($request->file('import_file'), $request->input('import_to_nest'));
+        $this->alert->success(trans('admin/nests.eggs.notices.imported'))->flash();
+
+        return redirect()->route('admin.nests.egg.view', ['egg' => $egg->id]);
+    }
+
+    /**
+     * Update an existing Egg using a new imported file.
+     *
+     * @param \Pterodactyl\Http\Requests\Admin\Egg\EggImportFormRequest $request
+     * @param int                                                       $egg
+     * @return \Illuminate\Http\RedirectResponse
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\BadJsonFormatException
+     * @throws \Pterodactyl\Exceptions\Service\InvalidFileUploadException
+     */
+    public function update(EggImportFormRequest $request, int $egg): RedirectResponse
+    {
+        $this->updateImporterService->handle($egg, $request->file('import_file'));
+        $this->alert->success(trans('admin/nests.eggs.notices.updated_via_import'))->flash();
+
+        return redirect()->route('admin.nests.egg.view', ['egg' => $egg]);
+    }
+}

app/Http/Controllers/Admin/Nests/EggVariableController.php

@@ -0,0 +1,146 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Http\Controllers\Admin\Nests;
+
+use Illuminate\View\View;
+use Pterodactyl\Models\Egg;
+use Pterodactyl\Models\EggVariable;
+use Illuminate\Http\RedirectResponse;
+use Prologue\Alerts\AlertsMessageBag;
+use Pterodactyl\Http\Controllers\Controller;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
+use Pterodactyl\Services\Eggs\Variables\VariableUpdateService;
+use Pterodactyl\Http\Requests\Admin\Egg\EggVariableFormRequest;
+use Pterodactyl\Services\Eggs\Variables\VariableCreationService;
+use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
+
+class EggVariableController extends Controller
+{
+    /**
+     * @var \Prologue\Alerts\AlertsMessageBag
+     */
+    protected $alert;
+
+    /**
+     * @var \Pterodactyl\Services\Eggs\Variables\VariableCreationService
+     */
+    protected $creationService;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * @var \Pterodactyl\Services\Eggs\Variables\VariableUpdateService
+     */
+    protected $updateService;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface
+     */
+    protected $variableRepository;
+
+    /**
+     * EggVariableController constructor.
+     *
+     * @param \Prologue\Alerts\AlertsMessageBag                                $alert
+     * @param \Pterodactyl\Services\Eggs\Variables\VariableCreationService     $creationService
+     * @param \Pterodactyl\Services\Eggs\Variables\VariableUpdateService       $updateService
+     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface         $repository
+     * @param \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface $variableRepository
+     */
+    public function __construct(
+        AlertsMessageBag $alert,
+        VariableCreationService $creationService,
+        VariableUpdateService $updateService,
+        EggRepositoryInterface $repository,
+        EggVariableRepositoryInterface $variableRepository
+    ) {
+        $this->alert = $alert;
+        $this->creationService = $creationService;
+        $this->repository = $repository;
+        $this->updateService = $updateService;
+        $this->variableRepository = $variableRepository;
+    }
+
+    /**
+     * Handle request to view the variables attached to an Egg.
+     *
+     * @param int $egg
+     * @return \Illuminate\View\View
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function view(int $egg): View
+    {
+        $egg = $this->repository->getWithVariables($egg);
+
+        return view('admin.eggs.variables', ['egg' => $egg]);
+    }
+
+    /**
+     * Handle a request to create a new Egg variable.
+     *
+     * @param \Pterodactyl\Http\Requests\Admin\Egg\EggVariableFormRequest $request
+     * @param \Pterodactyl\Models\Egg                                     $egg
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\Variable\ReservedVariableNameException
+     */
+    public function store(EggVariableFormRequest $request, Egg $egg): RedirectResponse
+    {
+        $this->creationService->handle($egg->id, $request->normalize());
+        $this->alert->success(trans('admin/nests.variables.notices.variable_created'))->flash();
+
+        return redirect()->route('admin.nests.egg.variables', $egg->id);
+    }
+
+    /**
+     * Handle a request to update an existing Egg variable.
+     *
+     * @param \Pterodactyl\Http\Requests\Admin\Egg\EggVariableFormRequest $request
+     * @param \Pterodactyl\Models\Egg                                     $egg
+     * @param \Pterodactyl\Models\EggVariable                             $variable
+     * @return \Illuminate\Http\RedirectResponse
+     *
+     * @throws \Pterodactyl\Exceptions\DisplayException
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\Variable\ReservedVariableNameException
+     */
+    public function update(EggVariableFormRequest $request, Egg $egg, EggVariable $variable): RedirectResponse
+    {
+        $this->updateService->handle($variable, $request->normalize());
+        $this->alert->success(trans('admin/nests.variables.notices.variable_updated', [
+            'variable' => $variable->name,
+        ]))->flash();
+
+        return redirect()->route('admin.nests.egg.variables', $egg->id);
+    }
+
+    /**
+     * Handle a request to delete an existing Egg variable from the Panel.
+     *
+     * @param int                             $egg
+     * @param \Pterodactyl\Models\EggVariable $variable
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy(int $egg, EggVariable $variable): RedirectResponse
+    {
+        $this->variableRepository->delete($variable->id);
+        $this->alert->success(trans('admin/nests.variables.notices.variable_deleted', [
+            'variable' => $variable->name,
+        ]))->flash();
+
+        return redirect()->route('admin.nests.egg.variables', $egg);
+    }
+}

app/Http/Controllers/Admin/Nests/NestController.php

@@ -0,0 +1,160 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Http\Controllers\Admin\Nests;
+
+use Illuminate\View\View;
+use Illuminate\Http\RedirectResponse;
+use Prologue\Alerts\AlertsMessageBag;
+use Pterodactyl\Http\Controllers\Controller;
+use Pterodactyl\Services\Nests\NestUpdateService;
+use Pterodactyl\Services\Nests\NestCreationService;
+use Pterodactyl\Services\Nests\NestDeletionService;
+use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
+use Pterodactyl\Http\Requests\Admin\Nest\StoreNestFormRequest;
+
+class NestController extends Controller
+{
+    /**
+     * @var \Prologue\Alerts\AlertsMessageBag
+     */
+    protected $alert;
+
+    /**
+     * @var \Pterodactyl\Services\Nests\NestCreationService
+     */
+    protected $nestCreationService;
+
+    /**
+     * @var \Pterodactyl\Services\Nests\NestDeletionService
+     */
+    protected $nestDeletionService;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * @var \Pterodactyl\Services\Nests\NestUpdateService
+     */
+    protected $nestUpdateService;
+
+    /**
+     * NestController constructor.
+     *
+     * @param \Prologue\Alerts\AlertsMessageBag                         $alert
+     * @param \Pterodactyl\Services\Nests\NestCreationService           $nestCreationService
+     * @param \Pterodactyl\Services\Nests\NestDeletionService           $nestDeletionService
+     * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface $repository
+     * @param \Pterodactyl\Services\Nests\NestUpdateService             $nestUpdateService
+     */
+    public function __construct(
+        AlertsMessageBag $alert,
+        NestCreationService $nestCreationService,
+        NestDeletionService $nestDeletionService,
+        NestRepositoryInterface $repository,
+        NestUpdateService $nestUpdateService
+    ) {
+        $this->alert = $alert;
+        $this->nestDeletionService = $nestDeletionService;
+        $this->nestCreationService = $nestCreationService;
+        $this->nestUpdateService = $nestUpdateService;
+        $this->repository = $repository;
+    }
+
+    /**
+     * Render nest listing page.
+     *
+     * @return \Illuminate\View\View
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function index(): View
+    {
+        return view('admin.nests.index', [
+            'nests' => $this->repository->getWithCounts(),
+        ]);
+    }
+
+    /**
+     * Render nest creation page.
+     *
+     * @return \Illuminate\View\View
+     */
+    public function create(): View
+    {
+        return view('admin.nests.new');
+    }
+
+    /**
+     * Handle the storage of a new nest.
+     *
+     * @param \Pterodactyl\Http\Requests\Admin\Nest\StoreNestFormRequest $request
+     * @return \Illuminate\Http\RedirectResponse
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     */
+    public function store(StoreNestFormRequest $request): RedirectResponse
+    {
+        $nest = $this->nestCreationService->handle($request->normalize());
+        $this->alert->success(trans('admin/nests.notices.created', ['name' => $nest->name]))->flash();
+
+        return redirect()->route('admin.nests.view', $nest->id);
+    }
+
+    /**
+     * Return details about a nest including all of the eggs and servers per egg.
+     *
+     * @param int $nest
+     * @return \Illuminate\View\View
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function view(int $nest): View
+    {
+        return view('admin.nests.view', [
+            'nest' => $this->repository->getWithEggServers($nest),
+        ]);
+    }
+
+    /**
+     * Handle request to update a nest.
+     *
+     * @param \Pterodactyl\Http\Requests\Admin\Nest\StoreNestFormRequest $request
+     * @param int                                                        $nest
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function update(StoreNestFormRequest $request, int $nest): RedirectResponse
+    {
+        $this->nestUpdateService->handle($nest, $request->normalize());
+        $this->alert->success(trans('admin/nests.notices.updated'))->flash();
+
+        return redirect()->route('admin.nests.view', $nest);
+    }
+
+    /**
+     * Handle request to delete a nest.
+     *
+     * @param int $nest
+     * @return \Illuminate\Http\RedirectResponse
+     *
+     * @throws \Pterodactyl\Exceptions\Service\HasActiveServersException
+     */
+    public function destroy(int $nest): RedirectResponse
+    {
+        $this->nestDeletionService->handle($nest);
+        $this->alert->success(trans('admin/nests.notices.deleted'))->flash();
+
+        return redirect()->route('admin.nests');
+    }
+}

app/Http/Controllers/Admin/OptionController.php

@@ -1,224 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Controllers\Admin;
-
-use Javascript;
-use Illuminate\Http\Request;
-use Prologue\Alerts\AlertsMessageBag;
-use Pterodactyl\Models\ServiceOption;
-use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Http\Requests\Admin\Service\EditOptionScript;
-use Pterodactyl\Services\Services\Options\OptionUpdateService;
-use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
-use Pterodactyl\Services\Services\Options\OptionCreationService;
-use Pterodactyl\Services\Services\Options\OptionDeletionService;
-use Pterodactyl\Http\Requests\Admin\Service\ServiceOptionFormRequest;
-use Pterodactyl\Services\Services\Options\InstallScriptUpdateService;
-use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
-use Pterodactyl\Exceptions\Service\ServiceOption\InvalidCopyFromException;
-use Pterodactyl\Exceptions\Service\ServiceOption\NoParentConfigurationFoundException;
-
-class OptionController extends Controller
-{
-    /**
-     * @var \Prologue\Alerts\AlertsMessageBag
-     */
-    protected $alert;
-
-    /**
-     * @var \Pterodactyl\Services\Services\Options\InstallScriptUpdateService
-     */
-    protected $installScriptUpdateService;
-
-    /**
-     * @var \Pterodactyl\Services\Services\Options\OptionCreationService
-     */
-    protected $optionCreationService;
-
-    /**
-     * @var \Pterodactyl\Services\Services\Options\OptionDeletionService
-     */
-    protected $optionDeletionService;
-
-    /**
-     * @var \Pterodactyl\Services\Services\Options\OptionUpdateService
-     */
-    protected $optionUpdateService;
-
-    /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface
-     */
-    protected $serviceRepository;
-
-    /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface
-     */
-    protected $serviceOptionRepository;
-
-    /**
-     * OptionController constructor.
-     *
-     * @param \Prologue\Alerts\AlertsMessageBag                                  $alert
-     * @param \Pterodactyl\Services\Services\Options\InstallScriptUpdateService  $installScriptUpdateService
-     * @param \Pterodactyl\Services\Services\Options\OptionCreationService       $optionCreationService
-     * @param \Pterodactyl\Services\Services\Options\OptionDeletionService       $optionDeletionService
-     * @param \Pterodactyl\Services\Services\Options\OptionUpdateService         $optionUpdateService
-     * @param \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface       $serviceRepository
-     * @param \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface $serviceOptionRepository
-     */
-    public function __construct(
-        AlertsMessageBag $alert,
-        InstallScriptUpdateService $installScriptUpdateService,
-        OptionCreationService $optionCreationService,
-        OptionDeletionService $optionDeletionService,
-        OptionUpdateService $optionUpdateService,
-        ServiceRepositoryInterface $serviceRepository,
-        ServiceOptionRepositoryInterface $serviceOptionRepository
-    ) {
-        $this->alert = $alert;
-        $this->installScriptUpdateService = $installScriptUpdateService;
-        $this->optionCreationService = $optionCreationService;
-        $this->optionDeletionService = $optionDeletionService;
-        $this->optionUpdateService = $optionUpdateService;
-        $this->serviceRepository = $serviceRepository;
-        $this->serviceOptionRepository = $serviceOptionRepository;
-    }
-
-    /**
-     * Handles request to view page for adding new option.
-     *
-     * @return \Illuminate\View\View
-     */
-    public function create()
-    {
-        $services = $this->serviceRepository->getWithOptions();
-        Javascript::put(['services' => $services->keyBy('id')]);
-
-        return view('admin.services.options.new', ['services' => $services]);
-    }
-
-    /**
-     * Handle adding a new service option.
-     *
-     * @param \Pterodactyl\Http\Requests\Admin\Service\ServiceOptionFormRequest $request
-     * @return \Illuminate\Http\RedirectResponse
-     *
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     */
-    public function store(ServiceOptionFormRequest $request)
-    {
-        try {
-            $option = $this->optionCreationService->handle($request->normalize());
-            $this->alert->success(trans('admin/services.options.notices.option_created'))->flash();
-        } catch (NoParentConfigurationFoundException $exception) {
-            $this->alert->danger($exception->getMessage())->flash();
-
-            return redirect()->back()->withInput();
-        }
-
-        return redirect()->route('admin.services.option.view', $option->id);
-    }
-
-    /**
-     * Delete a given option from the database.
-     *
-     * @param \Pterodactyl\Models\ServiceOption $option
-     * @return \Illuminate\Http\RedirectResponse
-     *
-     * @throws \Pterodactyl\Exceptions\Service\HasActiveServersException
-     */
-    public function destroy(ServiceOption $option)
-    {
-        $this->optionDeletionService->handle($option->id);
-        $this->alert->success(trans('admin/services.options.notices.option_deleted'))->flash();
-
-        return redirect()->route('admin.services.view', $option->service_id);
-    }
-
-    /**
-     * Display option overview page.
-     *
-     * @param \Pterodactyl\Models\ServiceOption $option
-     * @return \Illuminate\View\View
-     */
-    public function viewConfiguration(ServiceOption $option)
-    {
-        return view('admin.services.options.view', ['option' => $option]);
-    }
-
-    /**
-     * Display script management page for an option.
-     *
-     * @param int $option
-     * @return \Illuminate\View\View
-     *
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     */
-    public function viewScripts($option)
-    {
-        $option = $this->serviceOptionRepository->getWithCopyFrom($option);
-        $copyOptions = $this->serviceOptionRepository->findWhere([
-            ['copy_script_from', '=', null],
-            ['service_id', '=', $option->service_id],
-            ['id', '!=', $option],
-        ]);
-        $relyScript = $this->serviceOptionRepository->findWhere([['copy_script_from', '=', $option]]);
-
-        return view('admin.services.options.scripts', [
-            'copyFromOptions' => $copyOptions,
-            'relyOnScript' => $relyScript,
-            'option' => $option,
-        ]);
-    }
-
-    /**
-     * Handles POST when editing a configration for a service option.
-     *
-     * @param \Illuminate\Http\Request          $request
-     * @param \Pterodactyl\Models\ServiceOption $option
-     * @return \Illuminate\Http\RedirectResponse
-     *
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     */
-    public function editConfiguration(Request $request, ServiceOption $option)
-    {
-        try {
-            $this->optionUpdateService->handle($option, $request->all());
-            $this->alert->success(trans('admin/services.options.notices.option_updated'))->flash();
-        } catch (NoParentConfigurationFoundException $exception) {
-            $this->alert->danger($exception->getMessage())->flash();
-        }
-
-        return redirect()->route('admin.services.option.view', $option->id);
-    }
-
-    /**
-     * Handles POST when updating script for a service option.
-     *
-     * @param \Pterodactyl\Http\Requests\Admin\Service\EditOptionScript $request
-     * @param \Pterodactyl\Models\ServiceOption                         $option
-     * @return \Illuminate\Http\RedirectResponse
-     *
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     */
-    public function updateScripts(EditOptionScript $request, ServiceOption $option)
-    {
-        try {
-            $this->installScriptUpdateService->handle($option, $request->normalize());
-            $this->alert->success(trans('admin/services.options.notices.script_updated'))->flash();
-        } catch (InvalidCopyFromException $exception) {
-            $this->alert->danger($exception->getMessage())->flash();
-        }
-
-        return redirect()->route('admin.services.option.scripts', $option->id);
-    }
-}

app/Http/Controllers/Admin/PackController.php

@@ -19,9 +19,9 @@ use Pterodactyl\Services\Packs\PackCreationService;
 use Pterodactyl\Services\Packs\PackDeletionService;
 use Pterodactyl\Http\Requests\Admin\PackFormRequest;
 use Pterodactyl\Services\Packs\TemplateUploadService;
+use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
 use Pterodactyl\Contracts\Repository\PackRepositoryInterface;
 use Illuminate\Contracts\Config\Repository as ConfigRepository;
-use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
 
 class PackController extends Controller
 {
@@ -61,7 +61,7 @@ class PackController extends Controller
     protected $updateService;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
      */
     protected $serviceRepository;
 
@@ -73,15 +73,15 @@ class PackController extends Controller
     /**
      * PackController constructor.
      *
-     * @param \Prologue\Alerts\AlertsMessageBag                            $alert
-     * @param \Illuminate\Contracts\Config\Repository                      $config
-     * @param \Pterodactyl\Services\Packs\ExportPackService                $exportService
-     * @param \Pterodactyl\Services\Packs\PackCreationService              $creationService
-     * @param \Pterodactyl\Services\Packs\PackDeletionService              $deletionService
-     * @param \Pterodactyl\Contracts\Repository\PackRepositoryInterface    $repository
-     * @param \Pterodactyl\Services\Packs\PackUpdateService                $updateService
-     * @param \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface $serviceRepository
-     * @param \Pterodactyl\Services\Packs\TemplateUploadService            $templateUploadService
+     * @param \Prologue\Alerts\AlertsMessageBag                         $alert
+     * @param \Illuminate\Contracts\Config\Repository                   $config
+     * @param \Pterodactyl\Services\Packs\ExportPackService             $exportService
+     * @param \Pterodactyl\Services\Packs\PackCreationService           $creationService
+     * @param \Pterodactyl\Services\Packs\PackDeletionService           $deletionService
+     * @param \Pterodactyl\Contracts\Repository\PackRepositoryInterface $repository
+     * @param \Pterodactyl\Services\Packs\PackUpdateService             $updateService
+     * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface $serviceRepository
+     * @param \Pterodactyl\Services\Packs\TemplateUploadService         $templateUploadService
      */
     public function __construct(
         AlertsMessageBag $alert,
@@ -91,7 +91,7 @@ class PackController extends Controller
         PackDeletionService $deletionService,
         PackRepositoryInterface $repository,
         PackUpdateService $updateService,
-        ServiceRepositoryInterface $serviceRepository,
+        NestRepositoryInterface $serviceRepository,
         TemplateUploadService $templateUploadService
     ) {
         $this->alert = $alert;
@@ -114,7 +114,7 @@ class PackController extends Controller
     public function index(Request $request)
     {
         return view('admin.packs.index', [
-            'packs' => $this->repository->search($request->input('query'))->paginateWithOptionAndServerCount(
+            'packs' => $this->repository->search($request->input('query'))->paginateWithEggAndServerCount(
                 $this->config->get('pterodactyl.paginate.admin.packs')
             ),
         ]);
@@ -124,11 +124,13 @@ class PackController extends Controller
      * Display new pack creation form.
      *
      * @return \Illuminate\View\View
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function create()
     {
         return view('admin.packs.new', [
-            'services' => $this->serviceRepository->getWithOptions(),
+            'nests' => $this->serviceRepository->getWithEggs(),
         ]);
     }
 
@@ -136,11 +138,13 @@ class PackController extends Controller
      * Display new pack creation modal for use with template upload.
      *
      * @return \Illuminate\View\View
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function newTemplate()
     {
         return view('admin.packs.modal', [
-            'services' => $this->serviceRepository->getWithOptions(),
+            'nests' => $this->serviceRepository->getWithEggs(),
         ]);
     }
 
@@ -152,7 +156,7 @@ class PackController extends Controller
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileMimeTypeException
-     * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException
+     * @throws \Pterodactyl\Exceptions\Service\InvalidFileUploadException
      * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidPackArchiveFormatException
      * @throws \Pterodactyl\Exceptions\Service\Pack\UnreadableZipArchiveException
      * @throws \Pterodactyl\Exceptions\Service\Pack\ZipExtractionException
@@ -160,7 +164,7 @@ class PackController extends Controller
     public function store(PackFormRequest $request)
     {
         if ($request->has('from_template')) {
-            $pack = $this->templateUploadService->handle($request->input('option_id'), $request->file('file_upload'));
+            $pack = $this->templateUploadService->handle($request->input('egg_id'), $request->file('file_upload'));
         } else {
             $pack = $this->creationService->handle($request->normalize(), $request->file('file_upload'));
         }
@@ -175,12 +179,13 @@ class PackController extends Controller
      *
      * @param int $pack
      * @return \Illuminate\View\View
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function view($pack)
     {
         return view('admin.packs.view', [
             'pack' => $this->repository->getWithServers($pack),
-            'services' => $this->serviceRepository->getWithOptions(),
+            'nests' => $this->serviceRepository->getWithEggs(),
         ]);
     }
 

app/Http/Controllers/Admin/ServersController.php

@@ -25,11 +25,11 @@ use Pterodactyl\Services\Servers\BuildModificationService;
 use Pterodactyl\Services\Database\DatabaseManagementService;
 use Pterodactyl\Services\Servers\DetailsModificationService;
 use Pterodactyl\Services\Servers\StartupModificationService;
+use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
 use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
 use Pterodactyl\Repositories\Eloquent\DatabaseHostRepository;
 use Illuminate\Contracts\Config\Repository as ConfigRepository;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
-use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
 use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
 use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
 use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
@@ -91,6 +91,11 @@ class ServersController extends Controller
      */
     protected $locationRepository;
 
+    /**
+     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
+     */
+    protected $nestRepository;
+
     /**
      * @var \Pterodactyl\Contracts\Repository\NodeRepositoryInterface
      */
@@ -111,11 +116,6 @@ class ServersController extends Controller
      */
     protected $service;
 
-    /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface
-     */
-    protected $serviceRepository;
-
     /**
      * @var \Pterodactyl\Services\Servers\StartupModificationService
      */
@@ -144,7 +144,7 @@ class ServersController extends Controller
      * @param \Pterodactyl\Contracts\Repository\NodeRepositoryInterface       $nodeRepository
      * @param \Pterodactyl\Services\Servers\ReinstallServerService            $reinstallService
      * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface     $repository
-     * @param \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface    $serviceRepository
+     * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface       $nestRepository
      * @param \Pterodactyl\Services\Servers\StartupModificationService        $startupModificationService
      * @param \Pterodactyl\Services\Servers\SuspensionService                 $suspensionService
      */
@@ -164,7 +164,7 @@ class ServersController extends Controller
         NodeRepositoryInterface $nodeRepository,
         ReinstallServerService $reinstallService,
         ServerRepositoryInterface $repository,
-        ServiceRepositoryInterface $serviceRepository,
+        NestRepositoryInterface $nestRepository,
         StartupModificationService $startupModificationService,
         SuspensionService $suspensionService
     ) {
@@ -179,11 +179,11 @@ class ServersController extends Controller
         $this->detailsModificationService = $detailsModificationService;
         $this->deletionService = $deletionService;
         $this->locationRepository = $locationRepository;
+        $this->nestRepository = $nestRepository;
         $this->nodeRepository = $nodeRepository;
         $this->reinstallService = $reinstallService;
         $this->repository = $repository;
         $this->service = $service;
-        $this->serviceRepository = $serviceRepository;
         $this->startupModificationService = $startupModificationService;
         $this->suspensionService = $suspensionService;
     }
@@ -218,19 +218,19 @@ class ServersController extends Controller
             return redirect()->route('admin.nodes');
         }
 
-        $services = $this->serviceRepository->getWithOptions();
+        $nests = $this->nestRepository->getWithEggs();
 
         Javascript::put([
-            'services' => $services->map(function ($item) {
+            'nests' => $nests->map(function ($item) {
                 return array_merge($item->toArray(), [
-                    'options' => $item->options->keyBy('id')->toArray(),
+                    'eggs' => $item->eggs->keyBy('id')->toArray(),
                 ]);
             })->keyBy('id'),
         ]);
 
         return view('admin.servers.new', [
             'locations' => $this->locationRepository->all(),
-            'services' => $services,
+            'nests' => $nests,
         ]);
     }
 
@@ -331,12 +331,12 @@ class ServersController extends Controller
             abort(404);
         }
 
-        $services = $this->serviceRepository->getWithOptions();
+        $nests = $this->nestRepository->getWithEggs();
 
         Javascript::put([
-            'services' => $services->map(function ($item) {
+            'nests' => $nests->map(function ($item) {
                 return array_merge($item->toArray(), [
-                    'options' => $item->options->keyBy('id')->toArray(),
+                    'eggs' => $item->eggs->keyBy('id')->toArray(),
                 ]);
             })->keyBy('id'),
             'server_variables' => $parameters->data,
@@ -344,7 +344,7 @@ class ServersController extends Controller
 
         return view('admin.servers.view.startup', [
             'server' => $parameters->server,
-            'services' => $services,
+            'nests' => $nests,
         ]);
     }
 
@@ -402,7 +402,7 @@ class ServersController extends Controller
     public function setDetails(Request $request, Server $server)
     {
         $this->detailsModificationService->edit($server, $request->only([
-            'owner_id', 'name', 'description', 'reset_token',
+            'owner_id', 'name', 'description',
         ]));
 
         $this->alert->success(trans('admin/server.alerts.details_updated'))->flash();

app/Http/Controllers/Admin/ServiceController.php

@@ -1,176 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Controllers\Admin;
-
-use Pterodactyl\Models\Service;
-use Prologue\Alerts\AlertsMessageBag;
-use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Services\Services\ServiceUpdateService;
-use Pterodactyl\Services\Services\ServiceCreationService;
-use Pterodactyl\Services\Services\ServiceDeletionService;
-use Pterodactyl\Http\Requests\Admin\Service\ServiceFormRequest;
-use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
-use Pterodactyl\Http\Requests\Admin\Service\ServiceFunctionsFormRequest;
-
-class ServiceController extends Controller
-{
-    /**
-     * @var \Prologue\Alerts\AlertsMessageBag
-     */
-    protected $alert;
-
-    /**
-     * @var \Pterodactyl\Services\Services\ServiceCreationService
-     */
-    protected $creationService;
-
-    /**
-     * @var \Pterodactyl\Services\Services\ServiceDeletionService
-     */
-    protected $deletionService;
-
-    /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface
-     */
-    protected $repository;
-
-    /**
-     * @var \Pterodactyl\Services\Services\ServiceUpdateService
-     */
-    protected $updateService;
-
-    public function __construct(
-        AlertsMessageBag $alert,
-        ServiceCreationService $creationService,
-        ServiceDeletionService $deletionService,
-        ServiceRepositoryInterface $repository,
-        ServiceUpdateService $updateService
-    ) {
-        $this->alert = $alert;
-        $this->creationService = $creationService;
-        $this->deletionService = $deletionService;
-        $this->repository = $repository;
-        $this->updateService = $updateService;
-    }
-
-    /**
-     * Display service overview page.
-     *
-     * @return \Illuminate\View\View
-     */
-    public function index()
-    {
-        return view('admin.services.index', [
-            'services' => $this->repository->getWithOptions(),
-        ]);
-    }
-
-    /**
-     * Display create service page.
-     *
-     * @return \Illuminate\View\View
-     */
-    public function create()
-    {
-        return view('admin.services.new');
-    }
-
-    /**
-     * Return base view for a service.
-     *
-     * @param int $service
-     * @return \Illuminate\View\View
-     */
-    public function view($service)
-    {
-        return view('admin.services.view', [
-            'service' => $this->repository->getWithOptionServers($service),
-        ]);
-    }
-
-    /**
-     * Return function editing view for a service.
-     *
-     * @param \Pterodactyl\Models\Service $service
-     * @return \Illuminate\View\View
-     */
-    public function viewFunctions(Service $service)
-    {
-        return view('admin.services.functions', ['service' => $service]);
-    }
-
-    /**
-     * Handle post action for new service.
-     *
-     * @param \Pterodactyl\Http\Requests\Admin\Service\ServiceFormRequest $request
-     * @return \Illuminate\Http\RedirectResponse
-     *
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     */
-    public function store(ServiceFormRequest $request)
-    {
-        $service = $this->creationService->handle($request->normalize());
-        $this->alert->success(trans('admin/services.notices.service_created', ['name' => $service->name]))->flash();
-
-        return redirect()->route('admin.services.view', $service->id);
-    }
-
-    /**
-     * Edits configuration for a specific service.
-     *
-     * @param \Pterodactyl\Http\Requests\Admin\Service\ServiceFormRequest $request
-     * @param \Pterodactyl\Models\Service                                 $service
-     * @return \Illuminate\Http\RedirectResponse
-     *
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     */
-    public function update(ServiceFormRequest $request, Service $service)
-    {
-        $this->updateService->handle($service->id, $request->normalize());
-        $this->alert->success(trans('admin/services.notices.service_updated'))->flash();
-
-        return redirect()->route('admin.services.view', $service);
-    }
-
-    /**
-     * Update the functions file for a service.
-     *
-     * @param \Pterodactyl\Http\Requests\Admin\Service\ServiceFunctionsFormRequest $request
-     * @param \Pterodactyl\Models\Service                                          $service
-     * @return \Illuminate\Http\RedirectResponse
-     *
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     */
-    public function updateFunctions(ServiceFunctionsFormRequest $request, Service $service)
-    {
-        $this->updateService->handle($service->id, $request->normalize());
-        $this->alert->success(trans('admin/services.notices.functions_updated'))->flash();
-
-        return redirect()->route('admin.services.view.functions', $service->id);
-    }
-
-    /**
-     * Delete a service from the panel.
-     *
-     * @param \Pterodactyl\Models\Service $service
-     * @return \Illuminate\Http\RedirectResponse
-     *
-     * @throws \Pterodactyl\Exceptions\Service\HasActiveServersException
-     */
-    public function destroy(Service $service)
-    {
-        $this->deletionService->handle($service->id);
-        $this->alert->success(trans('admin/services.notices.service_deleted'))->flash();
-
-        return redirect()->route('admin.services');
-    }
-}

app/Http/Controllers/Admin/UserController.php

@@ -159,6 +159,7 @@ class UserController extends Controller
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function update(UserFormRequest $request, User $user)
     {

app/Http/Controllers/Admin/VariableController.php

@@ -1,133 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Controllers\Admin;
-
-use Prologue\Alerts\AlertsMessageBag;
-use Pterodactyl\Models\ServiceOption;
-use Pterodactyl\Models\ServiceVariable;
-use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Http\Requests\Admin\OptionVariableFormRequest;
-use Pterodactyl\Repositories\Eloquent\ServiceVariableRepository;
-use Pterodactyl\Services\Services\Variables\VariableUpdateService;
-use Pterodactyl\Services\Services\Variables\VariableCreationService;
-use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
-
-class VariableController extends Controller
-{
-    /**
-     * @var \Prologue\Alerts\AlertsMessageBag
-     */
-    protected $alert;
-
-    /**
-     * @var \Pterodactyl\Services\Services\Variables\VariableCreationService
-     */
-    protected $creationService;
-
-    /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface
-     */
-    protected $serviceOptionRepository;
-
-    /**
-     * @var \Pterodactyl\Repositories\Eloquent\ServiceVariableRepository
-     */
-    protected $serviceVariableRepository;
-
-    /**
-     * @var \Pterodactyl\Services\Services\Variables\VariableUpdateService
-     */
-    protected $updateService;
-
-    public function __construct(
-        AlertsMessageBag $alert,
-        ServiceOptionRepositoryInterface $serviceOptionRepository,
-        ServiceVariableRepository $serviceVariableRepository,
-        VariableCreationService $creationService,
-        VariableUpdateService $updateService
-    ) {
-        $this->alert = $alert;
-        $this->creationService = $creationService;
-        $this->serviceOptionRepository = $serviceOptionRepository;
-        $this->serviceVariableRepository = $serviceVariableRepository;
-        $this->updateService = $updateService;
-    }
-
-    /**
-     * Handles POST request to create a new option variable.
-     *
-     * @param \Pterodactyl\Http\Requests\Admin\OptionVariableFormRequest $request
-     * @param \Pterodactyl\Models\ServiceOption                          $option
-     * @return \Illuminate\Http\RedirectResponse
-     *
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Service\ServiceVariable\ReservedVariableNameException
-     */
-    public function store(OptionVariableFormRequest $request, ServiceOption $option)
-    {
-        $this->creationService->handle($option->id, $request->normalize());
-        $this->alert->success(trans('admin/services.variables.notices.variable_created'))->flash();
-
-        return redirect()->route('admin.services.option.variables', $option->id);
-    }
-
-    /**
-     * Display variable overview page for a service option.
-     *
-     * @param int $option
-     * @return \Illuminate\View\View
-     */
-    public function view($option)
-    {
-        $option = $this->serviceOptionRepository->getWithVariables($option);
-
-        return view('admin.services.options.variables', ['option' => $option]);
-    }
-
-    /**
-     * Handles POST when editing a configration for a service variable.
-     *
-     * @param \Pterodactyl\Http\Requests\Admin\OptionVariableFormRequest $request
-     * @param \Pterodactyl\Models\ServiceOption                          $option
-     * @param \Pterodactyl\Models\ServiceVariable                        $variable
-     * @return \Illuminate\Http\RedirectResponse
-     *
-     * @throws \Pterodactyl\Exceptions\DisplayException
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     * @throws \Pterodactyl\Exceptions\Service\ServiceVariable\ReservedVariableNameException
-     */
-    public function update(OptionVariableFormRequest $request, ServiceOption $option, ServiceVariable $variable)
-    {
-        $this->updateService->handle($variable, $request->normalize());
-        $this->alert->success(trans('admin/services.variables.notices.variable_updated', [
-            'variable' => $variable->name,
-        ]))->flash();
-
-        return redirect()->route('admin.services.option.variables', $option->id);
-    }
-
-    /**
-     * Delete a service variable from the system.
-     *
-     * @param \Pterodactyl\Models\ServiceOption   $option
-     * @param \Pterodactyl\Models\ServiceVariable $variable
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function delete(ServiceOption $option, ServiceVariable $variable)
-    {
-        $this->serviceVariableRepository->delete($variable->id);
-        $this->alert->success(trans('admin/services.variables.notices.variable_deleted', [
-            'variable' => $variable->name,
-        ]))->flash();
-
-        return redirect()->route('admin.services.option.variables', $option->id);
-    }
-}

app/Http/Controllers/Daemon/ServiceController.php

@@ -1,85 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Controllers\Daemon;
-
-use Illuminate\Http\Request;
-use Pterodactyl\Models\Service;
-use Pterodactyl\Models\ServiceOption;
-use Pterodactyl\Http\Controllers\Controller;
-
-class ServiceController extends Controller
-{
-    /**
-     * Returns a listing of all services currently on the system,
-     * as well as the associated files and the file hashes for
-     * caching purposes.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function listServices(Request $request)
-    {
-        $response = [];
-        foreach (Service::all() as $service) {
-            $response[$service->folder] = [
-                'main.json' => sha1($this->getConfiguration($service->id)->toJson()),
-                'index.js' => sha1($service->index_file),
-            ];
-        }
-
-        return response()->json($response);
-    }
-
-    /**
-     * Returns the contents of the requested file for the given service.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param string                   $folder
-     * @param string                   $file
-     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\FileResponse
-     */
-    public function pull(Request $request, $folder, $file)
-    {
-        $service = Service::where('folder', $folder)->firstOrFail();
-
-        if ($file === 'index.js') {
-            return response($service->index_file)->header('Content-Type', 'text/plain');
-        } elseif ($file === 'main.json') {
-            return response()->json($this->getConfiguration($service->id));
-        }
-
-        return abort(404);
-    }
-
-    /**
-     * Returns a `main.json` file based on the configuration
-     * of each service option.
-     *
-     * @param int $id
-     * @return \Illuminate\Support\Collection
-     */
-    protected function getConfiguration($id)
-    {
-        $options = ServiceOption::where('service_id', $id)->get();
-
-        return $options->mapWithKeys(function ($item) use ($options) {
-            return [
-                $item->tag => array_filter([
-                    'symlink' => $options->where('id', $item->config_from)->pluck('tag')->pop(),
-                    'startup' => json_decode($item->config_startup),
-                    'stop' => $item->config_stop,
-                    'configs' => json_decode($item->config_files),
-                    'log' => json_decode($item->config_logs),
-                    'query' => 'none',
-                ]),
-            ];
-        });
-    }
-}

app/Http/Controllers/Server/ServerController.php

@@ -54,7 +54,7 @@ class ServerController extends Controller
         $this->authorize('view-startup', $server);
 
         $server->load(['node', 'allocation', 'variables']);
-        $variables = Models\ServiceVariable::where('option_id', $server->option_id)->get();
+        $variables = Models\EggVariable::where('option_id', $server->option_id)->get();
 
         $replacements = [
             '{{SERVER_MEMORY}}' => $server->memory,

app/Http/Requests/Admin/AdminFormRequest.php

@@ -13,6 +13,11 @@ use Illuminate\Foundation\Http\FormRequest;
 
 abstract class AdminFormRequest extends FormRequest
 {
+    /**
+     * The rules to apply to the incoming form request.
+     *
+     * @return array
+     */
     abstract public function rules();
 
     /**

app/Http/Requests/Admin/Egg/EggFormRequest.php

@@ -0,0 +1,49 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Http\Requests\Admin\Egg;
+
+use Pterodactyl\Http\Requests\Admin\AdminFormRequest;
+
+class EggFormRequest extends AdminFormRequest
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function rules()
+    {
+        $rules = [
+            'name' => 'required|string|max:255',
+            'description' => 'required|string',
+            'docker_image' => 'required|string|max:255',
+            'startup' => 'required|string',
+            'config_from' => 'sometimes|bail|nullable|numeric',
+            'config_stop' => 'required_without:config_from|nullable|string|max:255',
+            'config_startup' => 'required_without:config_from|nullable|json',
+            'config_logs' => 'required_without:config_from|nullable|json',
+            'config_files' => 'required_without:config_from|nullable|json',
+        ];
+
+        if ($this->method() === 'POST') {
+            $rules['nest_id'] = 'required|numeric|exists:nests,id';
+        }
+
+        return $rules;
+    }
+
+    /**
+     * @param \Illuminate\Contracts\Validation\Validator $validator
+     */
+    public function withValidator($validator)
+    {
+        $validator->sometimes('config_from', 'exists:eggs,id', function () {
+            return (int) $this->input('config_from') !== 0;
+        });
+    }
+}

app/Http/Requests/Admin/Egg/EggImportFormRequest.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Http\Requests\Admin\Egg;
+
+use Pterodactyl\Http\Requests\Admin\AdminFormRequest;
+
+class EggImportFormRequest extends AdminFormRequest
+{
+    /**
+     * @return array
+     */
+    public function rules()
+    {
+        $rules = [
+            'import_file' => 'bail|required|file|max:1000|mimetypes:application/json,text/plain',
+        ];
+
+        if ($this->method() !== 'PUT') {
+            $rules['import_to_nest'] = 'bail|required|integer|exists:nests,id';
+        }
+
+        return $rules;
+    }
+}

app/Http/Requests/Admin/Egg/EggScriptFormRequest.php

@@ -7,11 +7,11 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Http\Requests\Admin\Service;
+namespace Pterodactyl\Http\Requests\Admin\Egg;
 
 use Pterodactyl\Http\Requests\Admin\AdminFormRequest;
 
-class EditOptionScript extends AdminFormRequest
+class EggScriptFormRequest extends AdminFormRequest
 {
     /**
      * Return the rules to be used when validating the sent data in the request.

app/Http/Requests/Admin/Egg/EggVariableFormRequest.php

@@ -7,11 +7,12 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Http\Requests\Admin;
+namespace Pterodactyl\Http\Requests\Admin\Egg;
 
-use Pterodactyl\Models\ServiceVariable;
+use Pterodactyl\Models\EggVariable;
+use Pterodactyl\Http\Requests\Admin\AdminFormRequest;
 
-class OptionVariableFormRequest extends AdminFormRequest
+class EggVariableFormRequest extends AdminFormRequest
 {
     /**
      * @return array
@@ -21,7 +22,7 @@ class OptionVariableFormRequest extends AdminFormRequest
         return [
             'name' => 'required|string|min:1|max:255',
             'description' => 'sometimes|nullable|string',
-            'env_variable' => 'required|regex:/^[\w]{1,255}$/|notIn:' . ServiceVariable::RESERVED_ENV_NAMES,
+            'env_variable' => 'required|regex:/^[\w]{1,255}$/|notIn:' . EggVariable::RESERVED_ENV_NAMES,
             'default_value' => 'string',
             'options' => 'sometimes|required|array',
             'rules' => 'bail|required|string',
@@ -37,11 +38,9 @@ class OptionVariableFormRequest extends AdminFormRequest
     {
         $rules = $this->input('rules');
         if ($this->method() === 'PATCH') {
-            $rules = $this->input('rules', $this->route()->parameter('variable')->rules);
+            $rules = $this->input('rules', $this->route()->parameter('egg')->rules);
         }
 
-        $validator->sometimes('default_value', $rules, function ($input) {
-            return $input->default_value;
-        });
+        $validator->addRules(['default_value' => $rules]);
     }
 }

app/Http/Requests/Admin/Nest/StoreNestFormRequest.php

@@ -7,11 +7,11 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Http\Requests\Admin\Service;
+namespace Pterodactyl\Http\Requests\Admin\Nest;
 
 use Pterodactyl\Http\Requests\Admin\AdminFormRequest;
 
-class ServiceFunctionsFormRequest extends AdminFormRequest
+class StoreNestFormRequest extends AdminFormRequest
 {
     /**
      * @return array
@@ -19,7 +19,8 @@ class ServiceFunctionsFormRequest extends AdminFormRequest
     public function rules()
     {
         return [
-            'index_file' => 'required|nullable|string',
+            'name' => 'required|string|min:1|max:255',
+            'description' => 'required|nullable|string',
         ];
     }
 }

app/Http/Requests/Admin/ServerFormRequest.php

@@ -63,7 +63,7 @@ class ServerFormRequest extends AdminFormRequest
             $validator->sometimes('pack_id', [
                 Rule::exists('packs', 'id')->where(function ($query) {
                     $query->where('selectable', 1);
-                    $query->where('option_id', $this->input('option_id'));
+                    $query->where('egg_id', $this->input('egg_id'));
                 }),
             ], function ($input) {
                 return $input->pack_id !== 0 && $input->pack_id !== null;

app/Http/Requests/Admin/Service/ServiceFormRequest.php

@@ -1,37 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Requests\Admin\Service;
-
-use Pterodactyl\Http\Requests\Admin\AdminFormRequest;
-
-class ServiceFormRequest extends AdminFormRequest
-{
-    /**
-     * @return array
-     */
-    public function rules()
-    {
-        $rules = [
-            'name' => 'required|string|min:1|max:255',
-            'description' => 'required|nullable|string',
-            'folder' => 'required|regex:/^[\w.-]{1,50}$/|unique:services,folder',
-            'startup' => 'required|nullable|string',
-        ];
-
-        if ($this->method() === 'PATCH') {
-            $service = $this->route()->parameter('service');
-            $rules['folder'] = $rules['folder'] . ',' . $service->id;
-
-            return $rules;
-        }
-
-        return $rules;
-    }
-}

app/Http/Requests/Admin/Service/ServiceOptionFormRequest.php

@@ -1,24 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Requests\Admin\Service;
-
-use Pterodactyl\Models\ServiceOption;
-use Pterodactyl\Http\Requests\Admin\AdminFormRequest;
-
-class ServiceOptionFormRequest extends AdminFormRequest
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function rules()
-    {
-        return ServiceOption::getCreateRules();
-    }
-}

app/Jobs/Schedule/RunTaskJob.php

@@ -162,7 +162,7 @@ class RunTaskJob extends Job implements ShouldQueue
         $repository = app()->make(ScheduleRepositoryInterface::class);
         $repository->withoutFresh()->update($this->schedule, [
             'is_processing' => false,
-            'last_run_at' => app()->make(Carbon::class)->now()->toDateTimeString(),
+            'last_run_at' => Carbon::now()->toDateTimeString(),
         ]);
     }
 

app/Models/Egg.php

@@ -0,0 +1,241 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Models;
+
+use Sofa\Eloquence\Eloquence;
+use Sofa\Eloquence\Validable;
+use Illuminate\Database\Eloquent\Model;
+use Sofa\Eloquence\Contracts\CleansAttributes;
+use Sofa\Eloquence\Contracts\Validable as ValidableContract;
+
+class Egg extends Model implements CleansAttributes, ValidableContract
+{
+    use Eloquence, Validable;
+
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'eggs';
+
+    /**
+     * Fields that are not mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'name',
+        'description',
+        'docker_image',
+        'config_files',
+        'config_startup',
+        'config_logs',
+        'config_stop',
+        'config_from',
+        'startup',
+        'script_is_privileged',
+        'script_install',
+        'script_entry',
+        'script_container',
+        'copy_script_from',
+    ];
+
+    /**
+     * Cast values to correct type.
+     *
+     * @var array
+     */
+    protected $casts = [
+        'nest_id' => 'integer',
+        'config_from' => 'integer',
+        'script_is_privileged' => 'boolean',
+        'copy_script_from' => 'integer',
+    ];
+
+    /**
+     * @var array
+     */
+    protected static $applicationRules = [
+        'nest_id' => 'required',
+        'uuid' => 'required',
+        'name' => 'required',
+        'description' => 'required',
+        'author' => 'required',
+        'docker_image' => 'required',
+        'startup' => 'required',
+        'config_from' => 'sometimes',
+        'config_stop' => 'required_without:config_from',
+        'config_startup' => 'required_without:config_from',
+        'config_logs' => 'required_without:config_from',
+        'config_files' => 'required_without:config_from',
+    ];
+
+    /**
+     * @var array
+     */
+    protected static $dataIntegrityRules = [
+        'nest_id' => 'bail|numeric|exists:nests,id',
+        'uuid' => 'string|size:36',
+        'name' => 'string|max:255',
+        'description' => 'string',
+        'author' => 'string|email',
+        'docker_image' => 'string|max:255',
+        'startup' => 'nullable|string',
+        'config_from' => 'bail|nullable|numeric|exists:eggs,id',
+        'config_stop' => 'nullable|string|max:255',
+        'config_startup' => 'nullable|json',
+        'config_logs' => 'nullable|json',
+        'config_files' => 'nullable|json',
+    ];
+
+    /**
+     * @var array
+     */
+    protected $attributes = [
+        'config_stop' => null,
+        'config_startup' => null,
+        'config_logs' => null,
+        'config_files' => null,
+    ];
+
+    /**
+     * Returns the install script for the egg; if egg is copying from another
+     * it will return the copied script.
+     *
+     * @return string
+     */
+    public function getCopyScriptInstallAttribute()
+    {
+        return (is_null($this->copy_script_from)) ? $this->script_install : $this->scriptFrom->script_install;
+    }
+
+    /**
+     * Returns the entry command for the egg; if egg is copying from another
+     * it will return the copied entry command.
+     *
+     * @return string
+     */
+    public function getCopyScriptEntryAttribute()
+    {
+        return (is_null($this->copy_script_from)) ? $this->script_entry : $this->scriptFrom->script_entry;
+    }
+
+    /**
+     * Returns the install container for the egg; if egg is copying from another
+     * it will return the copied install container.
+     *
+     * @return string
+     */
+    public function getCopyScriptContainerAttribute()
+    {
+        return (is_null($this->copy_script_from)) ? $this->script_container : $this->scriptFrom->script_container;
+    }
+
+    /**
+     * Return the file configuration for an egg.
+     *
+     * @return string
+     */
+    public function getInheritConfigFilesAttribute()
+    {
+        return is_null($this->config_from) ? $this->config_files : $this->configFrom->config_files;
+    }
+
+    /**
+     * Return the startup configuration for an egg.
+     *
+     * @return string
+     */
+    public function getInheritConfigStartupAttribute()
+    {
+        return is_null($this->config_from) ? $this->config_startup : $this->configFrom->config_startup;
+    }
+
+    /**
+     * Return the log reading configuration for an egg.
+     *
+     * @return string
+     */
+    public function getInheritConfigLogsAttribute()
+    {
+        return is_null($this->config_from) ? $this->config_logs : $this->configFrom->config_logs;
+    }
+
+    /**
+     * Return the stop command configuration for an egg.
+     *
+     * @return string
+     */
+    public function getInheritConfigStopAttribute()
+    {
+        return is_null($this->config_from) ? $this->config_stop : $this->configFrom->config_stop;
+    }
+
+    /**
+     * Gets nest associated with an egg.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function nest()
+    {
+        return $this->belongsTo(Nest::class);
+    }
+
+    /**
+     * Gets all servers associated with this egg.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function servers()
+    {
+        return $this->hasMany(Server::class, 'egg_id');
+    }
+
+    /**
+     * Gets all variables associated with this egg.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function variables()
+    {
+        return $this->hasMany(EggVariable::class, 'egg_id');
+    }
+
+    /**
+     * Gets all packs associated with this egg.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function packs()
+    {
+        return $this->hasMany(Pack::class, 'egg_id');
+    }
+
+    /**
+     * Get the parent egg from which to copy scripts.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function scriptFrom()
+    {
+        return $this->belongsTo(self::class, 'copy_script_from');
+    }
+
+    /**
+     * Get the parent egg from which to copy configuration settings.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function configFrom()
+    {
+        return $this->belongsTo(self::class, 'config_from');
+    }
+}

app/Models/EggVariable.php

@@ -15,7 +15,7 @@ use Illuminate\Database\Eloquent\Model;
 use Sofa\Eloquence\Contracts\CleansAttributes;
 use Sofa\Eloquence\Contracts\Validable as ValidableContract;
 
-class ServiceVariable extends Model implements CleansAttributes, ValidableContract
+class EggVariable extends Model implements CleansAttributes, ValidableContract
 {
     use Eloquence, Validable;
 
@@ -31,7 +31,7 @@ class ServiceVariable extends Model implements CleansAttributes, ValidableContra
      *
      * @var string
      */
-    protected $table = 'service_variables';
+    protected $table = 'egg_variables';
 
     /**
      * Fields that are not mass assignable.
@@ -46,7 +46,7 @@ class ServiceVariable extends Model implements CleansAttributes, ValidableContra
      * @var array
      */
     protected $casts = [
-        'option_id' => 'integer',
+        'egg_id' => 'integer',
         'user_viewable' => 'integer',
         'user_editable' => 'integer',
     ];
@@ -64,7 +64,7 @@ class ServiceVariable extends Model implements CleansAttributes, ValidableContra
      * @var array
      */
     protected static $dataIntegrityRules = [
-        'option_id' => 'exists:service_options,id',
+        'egg_id' => 'exists:eggs,id',
         'name' => 'string|between:1,255',
         'description' => 'nullable|string',
         'env_variable' => 'regex:/^[\w]{1,255}$/|notIn:' . self::RESERVED_ENV_NAMES,
@@ -83,9 +83,6 @@ class ServiceVariable extends Model implements CleansAttributes, ValidableContra
     ];
 
     /**
-     * Returns the display executable for the option and will use the parent
-     * service one if the option does not have one defined.
-     *
      * @return bool
      */
     public function getRequiredAttribute($value)

app/Models/Nest.php

@@ -15,7 +15,7 @@ use Illuminate\Database\Eloquent\Model;
 use Sofa\Eloquence\Contracts\CleansAttributes;
 use Sofa\Eloquence\Contracts\Validable as ValidableContract;
 
-class Service extends Model implements CleansAttributes, ValidableContract
+class Nest extends Model implements CleansAttributes, ValidableContract
 {
     use Eloquence, Validable;
 
@@ -24,14 +24,17 @@ class Service extends Model implements CleansAttributes, ValidableContract
      *
      * @var string
      */
-    protected $table = 'services';
+    protected $table = 'nests';
 
     /**
      * Fields that are mass assignable.
      *
      * @var array
      */
-    protected $fillable = ['name', 'author', 'description', 'folder', 'startup', 'index_file'];
+    protected $fillable = [
+        'name',
+        'description',
+    ];
 
     /**
      * @var array
@@ -40,50 +43,39 @@ class Service extends Model implements CleansAttributes, ValidableContract
         'author' => 'required',
         'name' => 'required',
         'description' => 'sometimes',
-        'folder' => 'required',
-        'startup' => 'sometimes',
-        'index_file' => 'required',
     ];
 
     /**
      * @var array
      */
     protected static $dataIntegrityRules = [
-        'author' => 'string|size:36',
+        'author' => 'string|email',
         'name' => 'string|max:255',
         'description' => 'nullable|string',
-        'folder' => 'string|max:255|regex:/^[\w.-]{1,50}$/|unique:services,folder',
-        'startup' => 'nullable|string',
-        'index_file' => 'string',
     ];
 
     /**
-     * Gets all service options associated with this service.
+     * Gets all eggs associated with this service.
      *
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
-    public function options()
+    public function eggs()
     {
-        return $this->hasMany(ServiceOption::class);
+        return $this->hasMany(Egg::class);
     }
 
     /**
-     * Returns all of the packs associated with a service, regardless of the service option.
+     * Returns all of the packs associated with a nest, regardless of the egg.
      *
      * @return \Illuminate\Database\Eloquent\Relations\HasManyThrough
      */
     public function packs()
     {
-        return $this->hasManyThrough(
-            Pack::class,
-            ServiceOption::class,
-            'service_id',
-            'option_id'
-        );
+        return $this->hasManyThrough(Pack::class, Egg::class, 'nest_id', 'egg_id');
     }
 
     /**
-     * Gets all servers associated with this service.
+     * Gets all servers associated with this nest.
      *
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */

app/Models/Pack.php

@@ -34,7 +34,7 @@ class Pack extends Model implements CleansAttributes, ValidableContract
      * @var array
      */
     protected $fillable = [
-        'option_id', 'uuid', 'name', 'version', 'description', 'selectable', 'visible', 'locked',
+        'egg_id', 'uuid', 'name', 'version', 'description', 'selectable', 'visible', 'locked',
     ];
 
     /**
@@ -47,7 +47,7 @@ class Pack extends Model implements CleansAttributes, ValidableContract
         'selectable' => 'sometimes|required',
         'visible' => 'sometimes|required',
         'locked' => 'sometimes|required',
-        'option_id' => 'required',
+        'egg_id' => 'required',
     ];
 
     /**
@@ -60,7 +60,7 @@ class Pack extends Model implements CleansAttributes, ValidableContract
         'selectable' => 'boolean',
         'visible' => 'boolean',
         'locked' => 'boolean',
-        'option_id' => 'exists:service_options,id',
+        'egg_id' => 'exists:eggs,id',
     ];
 
     /**
@@ -69,7 +69,7 @@ class Pack extends Model implements CleansAttributes, ValidableContract
      * @var array
      */
     protected $casts = [
-        'option_id' => 'integer',
+        'egg_id' => 'integer',
         'selectable' => 'boolean',
         'visible' => 'boolean',
         'locked' => 'boolean',
@@ -83,9 +83,8 @@ class Pack extends Model implements CleansAttributes, ValidableContract
     protected $searchableColumns = [
         'name' => 10,
         'uuid' => 8,
-        'option.name' => 6,
-        'option.tag' => 5,
-        'option.docker_image' => 5,
+        'egg.name' => 6,
+        'egg.docker_image' => 5,
         'version' => 2,
     ];
 
@@ -114,13 +113,13 @@ class Pack extends Model implements CleansAttributes, ValidableContract
     }
 
     /**
-     * Gets option associated with a service pack.
+     * Gets egg associated with a service pack.
      *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
-    public function option()
+    public function egg()
     {
-        return $this->belongsTo(ServiceOption::class);
+        return $this->belongsTo(Egg::class);
     }
 
     /**

app/Models/Server.php

@@ -68,8 +68,8 @@ class Server extends Model implements CleansAttributes, ValidableContract
         'io' => 'required',
         'cpu' => 'required',
         'disk' => 'required',
-        'service_id' => 'required',
-        'option_id' => 'required',
+        'nest_id' => 'required',
+        'egg_id' => 'required',
         'node_id' => 'required',
         'allocation_id' => 'required',
         'pack_id' => 'sometimes',
@@ -92,8 +92,8 @@ class Server extends Model implements CleansAttributes, ValidableContract
         'cpu' => 'numeric|min:0',
         'disk' => 'numeric|min:0',
         'allocation_id' => 'exists:allocations,id',
-        'service_id' => 'exists:services,id',
-        'option_id' => 'exists:service_options,id',
+        'nest_id' => 'exists:nests,id',
+        'egg_id' => 'exists:eggs,id',
         'pack_id' => 'nullable|numeric|min:0',
         'custom_container' => 'nullable|string',
         'startup' => 'nullable|string',
@@ -119,8 +119,8 @@ class Server extends Model implements CleansAttributes, ValidableContract
         'cpu' => 'integer',
         'oom_disabled' => 'integer',
         'allocation_id' => 'integer',
-        'service_id' => 'integer',
-        'option_id' => 'integer',
+        'nest_id' => 'integer',
+        'egg_id' => 'integer',
         'pack_id' => 'integer',
         'installed' => 'integer',
     ];
@@ -202,23 +202,23 @@ class Server extends Model implements CleansAttributes, ValidableContract
     }
 
     /**
-     * Gets information for the service associated with this server.
+     * Gets information for the nest associated with this server.
      *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
-    public function service()
+    public function nest()
     {
-        return $this->belongsTo(Service::class);
+        return $this->belongsTo(Nest::class);
     }
 
     /**
-     * Gets information for the service option associated with this server.
+     * Gets information for the egg associated with this server.
      *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
-    public function option()
+    public function egg()
     {
-        return $this->belongsTo(ServiceOption::class);
+        return $this->belongsTo(Egg::class);
     }
 
     /**

app/Models/ServerVariable.php

@@ -74,6 +74,6 @@ class ServerVariable extends Model
      */
     public function variable()
     {
-        return $this->belongsTo(ServiceVariable::class, 'variable_id');
+        return $this->belongsTo(EggVariable::class, 'variable_id');
     }
 }

app/Models/ServiceOption.php

@@ -1,185 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Models;
-
-use Sofa\Eloquence\Eloquence;
-use Sofa\Eloquence\Validable;
-use Illuminate\Database\Eloquent\Model;
-use Sofa\Eloquence\Contracts\CleansAttributes;
-use Sofa\Eloquence\Contracts\Validable as ValidableContract;
-
-class ServiceOption extends Model implements CleansAttributes, ValidableContract
-{
-    use Eloquence, Validable;
-
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-    protected $table = 'service_options';
-
-    /**
-     * Fields that are not mass assignable.
-     *
-     * @var array
-     */
-    protected $guarded = ['id', 'created_at', 'updated_at'];
-
-    /**
-     * Cast values to correct type.
-     *
-     * @var array
-     */
-    protected $casts = [
-        'service_id' => 'integer',
-        'script_is_privileged' => 'boolean',
-    ];
-
-    /**
-     * @var array
-     */
-    protected static $applicationRules = [
-        'service_id' => 'required',
-        'name' => 'required',
-        'description' => 'required',
-        'tag' => 'required',
-        'docker_image' => 'sometimes',
-        'startup' => 'sometimes',
-        'config_from' => 'sometimes',
-        'config_stop' => 'required_without:config_from',
-        'config_startup' => 'required_without:config_from',
-        'config_logs' => 'required_without:config_from',
-        'config_files' => 'required_without:config_from',
-    ];
-
-    /**
-     * @var array
-     */
-    protected static $dataIntegrityRules = [
-        'service_id' => 'numeric|exists:services,id',
-        'name' => 'string|max:255',
-        'description' => 'string',
-        'tag' => 'alpha_num|max:60|unique:service_options,tag',
-        'docker_image' => 'string|max:255',
-        'startup' => 'nullable|string',
-        'config_from' => 'nullable|numeric|exists:service_options,id',
-        'config_stop' => 'nullable|string|max:255',
-        'config_startup' => 'nullable|json',
-        'config_logs' => 'nullable|json',
-        'config_files' => 'nullable|json',
-    ];
-
-    /**
-     * @var array
-     */
-    protected $attributes = [
-        'config_stop' => null,
-        'config_startup' => null,
-        'config_logs' => null,
-        'config_files' => null,
-        'startup' => null,
-        'docker_image' => null,
-    ];
-
-    /**
-     * Returns the display startup string for the option and will use the parent
-     * service one if the option does not have one defined.
-     *
-     * @return string
-     */
-    public function getDisplayStartupAttribute($value)
-    {
-        return (is_null($this->startup)) ? $this->service->startup : $this->startup;
-    }
-
-    /**
-     * Returns the install script for the option; if option is copying from another
-     * it will return the copied script.
-     *
-     * @return string
-     */
-    public function getCopyScriptInstallAttribute($value)
-    {
-        return (is_null($this->copy_script_from)) ? $this->script_install : $this->copyFrom->script_install;
-    }
-
-    /**
-     * Returns the entry command for the option; if option is copying from another
-     * it will return the copied entry command.
-     *
-     * @return string
-     */
-    public function getCopyScriptEntryAttribute($value)
-    {
-        return (is_null($this->copy_script_from)) ? $this->script_entry : $this->copyFrom->script_entry;
-    }
-
-    /**
-     * Returns the install container for the option; if option is copying from another
-     * it will return the copied install container.
-     *
-     * @return string
-     */
-    public function getCopyScriptContainerAttribute($value)
-    {
-        return (is_null($this->copy_script_from)) ? $this->script_container : $this->copyFrom->script_container;
-    }
-
-    /**
-     * Gets service associated with a service option.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function service()
-    {
-        return $this->belongsTo(Service::class);
-    }
-
-    /**
-     * Gets all servers associated with this service option.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function servers()
-    {
-        return $this->hasMany(Server::class, 'option_id');
-    }
-
-    /**
-     * Gets all variables associated with this service.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function variables()
-    {
-        return $this->hasMany(ServiceVariable::class, 'option_id');
-    }
-
-    /**
-     * Gets all packs associated with this service.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function packs()
-    {
-        return $this->hasMany(Pack::class, 'option_id');
-    }
-
-    /**
-     * Get the parent service option from which to copy scripts.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function copyFrom()
-    {
-        return $this->belongsTo(self::class, 'copy_script_from');
-    }
-}

app/Providers/RepositoryServiceProvider.php

@@ -12,6 +12,8 @@ namespace Pterodactyl\Providers;
 use Illuminate\Support\ServiceProvider;
 use Pterodactyl\Repositories\Daemon\FileRepository;
 use Pterodactyl\Repositories\Daemon\PowerRepository;
+use Pterodactyl\Repositories\Eloquent\EggRepository;
+use Pterodactyl\Repositories\Eloquent\NestRepository;
 use Pterodactyl\Repositories\Eloquent\NodeRepository;
 use Pterodactyl\Repositories\Eloquent\PackRepository;
 use Pterodactyl\Repositories\Eloquent\TaskRepository;
@@ -19,7 +21,6 @@ use Pterodactyl\Repositories\Eloquent\UserRepository;
 use Pterodactyl\Repositories\Daemon\CommandRepository;
 use Pterodactyl\Repositories\Eloquent\ApiKeyRepository;
 use Pterodactyl\Repositories\Eloquent\ServerRepository;
-use Pterodactyl\Repositories\Eloquent\ServiceRepository;
 use Pterodactyl\Repositories\Eloquent\SessionRepository;
 use Pterodactyl\Repositories\Eloquent\SubuserRepository;
 use Pterodactyl\Repositories\Eloquent\DatabaseRepository;
@@ -28,22 +29,21 @@ use Pterodactyl\Repositories\Eloquent\ScheduleRepository;
 use Pterodactyl\Repositories\Eloquent\DaemonKeyRepository;
 use Pterodactyl\Repositories\Eloquent\AllocationRepository;
 use Pterodactyl\Repositories\Eloquent\PermissionRepository;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
 use Pterodactyl\Repositories\Daemon\ConfigurationRepository;
+use Pterodactyl\Repositories\Eloquent\EggVariableRepository;
+use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
 use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
 use Pterodactyl\Contracts\Repository\PackRepositoryInterface;
 use Pterodactyl\Contracts\Repository\TaskRepositoryInterface;
 use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
 use Pterodactyl\Repositories\Eloquent\DatabaseHostRepository;
 use Pterodactyl\Repositories\Eloquent\ApiPermissionRepository;
-use Pterodactyl\Repositories\Eloquent\ServiceOptionRepository;
 use Pterodactyl\Contracts\Repository\ApiKeyRepositoryInterface;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
-use Pterodactyl\Repositories\Eloquent\OptionVariableRepository;
 use Pterodactyl\Repositories\Eloquent\ServerVariableRepository;
-use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
 use Pterodactyl\Contracts\Repository\SessionRepositoryInterface;
 use Pterodactyl\Contracts\Repository\SubuserRepositoryInterface;
-use Pterodactyl\Repositories\Eloquent\ServiceVariableRepository;
 use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
 use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
 use Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface;
@@ -51,14 +51,12 @@ use Pterodactyl\Contracts\Repository\DaemonKeyRepositoryInterface;
 use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
 use Pterodactyl\Contracts\Repository\PermissionRepositoryInterface;
 use Pterodactyl\Contracts\Repository\Daemon\FileRepositoryInterface;
+use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
 use Pterodactyl\Contracts\Repository\Daemon\PowerRepositoryInterface;
 use Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface;
 use Pterodactyl\Contracts\Repository\ApiPermissionRepositoryInterface;
-use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
 use Pterodactyl\Contracts\Repository\Daemon\CommandRepositoryInterface;
-use Pterodactyl\Contracts\Repository\OptionVariableRepositoryInterface;
 use Pterodactyl\Contracts\Repository\ServerVariableRepositoryInterface;
-use Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface;
 use Pterodactyl\Contracts\Repository\Daemon\ConfigurationRepositoryInterface;
 use Pterodactyl\Repositories\Daemon\ServerRepository as DaemonServerRepository;
 use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
@@ -77,17 +75,16 @@ class RepositoryServiceProvider extends ServiceProvider
         $this->app->bind(DaemonKeyRepositoryInterface::class, DaemonKeyRepository::class);
         $this->app->bind(DatabaseRepositoryInterface::class, DatabaseRepository::class);
         $this->app->bind(DatabaseHostRepositoryInterface::class, DatabaseHostRepository::class);
+        $this->app->bind(EggRepositoryInterface::class, EggRepository::class);
+        $this->app->bind(EggVariableRepositoryInterface::class, EggVariableRepository::class);
         $this->app->bind(LocationRepositoryInterface::class, LocationRepository::class);
+        $this->app->bind(NestRepositoryInterface::class, NestRepository::class);
         $this->app->bind(NodeRepositoryInterface::class, NodeRepository::class);
-        $this->app->bind(OptionVariableRepositoryInterface::class, OptionVariableRepository::class);
         $this->app->bind(PackRepositoryInterface::class, PackRepository::class);
         $this->app->bind(PermissionRepositoryInterface::class, PermissionRepository::class);
         $this->app->bind(ScheduleRepositoryInterface::class, ScheduleRepository::class);
         $this->app->bind(ServerRepositoryInterface::class, ServerRepository::class);
         $this->app->bind(ServerVariableRepositoryInterface::class, ServerVariableRepository::class);
-        $this->app->bind(ServiceRepositoryInterface::class, ServiceRepository::class);
-        $this->app->bind(ServiceOptionRepositoryInterface::class, ServiceOptionRepository::class);
-        $this->app->bind(ServiceVariableRepositoryInterface::class, ServiceVariableRepository::class);
         $this->app->bind(SessionRepositoryInterface::class, SessionRepository::class);
         $this->app->bind(SubuserRepositoryInterface::class, SubuserRepository::class);
         $this->app->bind(TaskRepositoryInterface::class, TaskRepository::class);

app/Repositories/Daemon/ServerRepository.php

@@ -10,61 +10,29 @@
 namespace Pterodactyl\Repositories\Daemon;
 
 use Webmozart\Assert\Assert;
-use Pterodactyl\Services\Servers\EnvironmentService;
+use Psr\Http\Message\ResponseInterface;
 use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface;
-use Pterodactyl\Contracts\Repository\ServerRepositoryInterface as DatabaseServerRepositoryInterface;
 
 class ServerRepository extends BaseRepository implements ServerRepositoryInterface
 {
     /**
-     * {@inheritdoc}
+     * Create a new server on the daemon for the panel.
+     *
+     * @param array $structure
+     * @param array $overrides
+     * @return \Psr\Http\Message\ResponseInterface
+     *
+     * @throws \GuzzleHttp\Exception\RequestException
      */
-    public function create($id, array $overrides = [], $start = false)
+    public function create(array $structure, array $overrides = []): ResponseInterface
     {
-        Assert::numeric($id, 'First argument passed to create must be numeric, received %s.');
-        Assert::boolean($start, 'Third argument passed to create must be boolean, received %s.');
-
-        $repository = $this->app->make(DatabaseServerRepositoryInterface::class);
-        $environment = $this->app->make(EnvironmentService::class);
-
-        $server = $repository->getDataForCreation($id);
-
-        $data = [
-            'uuid' => (string) $server->uuid,
-            'user' => $server->username,
-            'build' => [
-                'default' => [
-                    'ip' => $server->allocation->ip,
-                    'port' => $server->allocation->port,
-                ],
-                'ports' => $server->allocations->groupBy('ip')->map(function ($item) {
-                    return $item->pluck('port');
-                })->toArray(),
-                'env' => $environment->process($server),
-                'memory' => (int) $server->memory,
-                'swap' => (int) $server->swap,
-                'io' => (int) $server->io,
-                'cpu' => (int) $server->cpu,
-                'disk' => (int) $server->disk,
-                'image' => $server->image,
-            ],
-            'service' => [
-                'type' => $server->option->service->folder,
-                'option' => $server->option->tag,
-                'pack' => object_get($server, 'pack.uuid'),
-                'skip_scripts' => $server->skip_scripts,
-            ],
-            'rebuild' => false,
-            'start_on_completion' => $start,
-        ];
-
         // Loop through overrides.
         foreach ($overrides as $key => $value) {
-            array_set($data, $key, $value);
+            array_set($structure, $key, $value);
         }
 
         return $this->getHttpClient()->request('POST', 'servers', [
-            'json' => $data,
+            'json' => $structure,
         ]);
     }
 

app/Repositories/Eloquent/EggRepository.php

@@ -0,0 +1,112 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Repositories\Eloquent;
+
+use Pterodactyl\Models\Egg;
+use Webmozart\Assert\Assert;
+use Illuminate\Database\Eloquent\Collection;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
+use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
+
+class EggRepository extends EloquentRepository implements EggRepositoryInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function model()
+    {
+        return Egg::class;
+    }
+
+    /**
+     * Return an egg with the variables relation attached.
+     *
+     * @param int $id
+     * @return \Pterodactyl\Models\Egg
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function getWithVariables(int $id): Egg
+    {
+        /** @var \Pterodactyl\Models\Egg $instance */
+        $instance = $this->getBuilder()->with('variables')->find($id, $this->getColumns());
+        if (! $instance) {
+            throw new RecordNotFoundException;
+        }
+
+        return $instance;
+    }
+
+    /**
+     * Return all eggs and their relations to be used in the daemon API.
+     *
+     * @return \Illuminate\Database\Eloquent\Collection
+     */
+    public function getAllWithCopyAttributes(): Collection
+    {
+        return $this->getBuilder()->with('scriptFrom', 'configFrom')->get($this->getColumns());
+    }
+
+    /**
+     * Return an egg with the scriptFrom and configFrom relations loaded onto the model.
+     *
+     * @param int|string $value
+     * @param string     $column
+     * @return \Pterodactyl\Models\Egg
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function getWithCopyAttributes($value, string $column = 'id'): Egg
+    {
+        Assert::true((is_digit($value) || is_string($value)), 'First argument passed to getWithCopyAttributes must be an integer or string, received %s.');
+
+        /** @var \Pterodactyl\Models\Egg $instance */
+        $instance = $this->getBuilder()->with('scriptFrom', 'configFrom')->where($column, '=', $value)->first($this->getColumns());
+        if (! $instance) {
+            throw new RecordNotFoundException;
+        }
+
+        return $instance;
+    }
+
+    /**
+     * Return all of the data needed to export a service.
+     *
+     * @param int $id
+     * @return \Pterodactyl\Models\Egg
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function getWithExportAttributes(int $id): Egg
+    {
+        /** @var \Pterodactyl\Models\Egg $instance */
+        $instance = $this->getBuilder()->with('scriptFrom', 'configFrom', 'variables')->find($id, $this->getColumns());
+        if (! $instance) {
+            throw new RecordNotFoundException;
+        }
+
+        return $instance;
+    }
+
+    /**
+     * Confirm a copy script belongs to the same nest as the item trying to use it.
+     *
+     * @param int $copyFromId
+     * @param int $service
+     * @return bool
+     */
+    public function isCopiableScript(int $copyFromId, int $service): bool
+    {
+        return $this->getBuilder()->whereNull('copy_script_from')
+            ->where('id', '=', $copyFromId)
+            ->where('nest_id', '=', $service)
+            ->exists();
+    }
+}

app/Repositories/Eloquent/EggVariableRepository.php

@@ -9,16 +9,16 @@
 
 namespace Pterodactyl\Repositories\Eloquent;
 
-use Pterodactyl\Models\ServiceVariable;
-use Pterodactyl\Contracts\Repository\OptionVariableRepositoryInterface;
+use Pterodactyl\Models\EggVariable;
+use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
 
-class OptionVariableRepository extends EloquentRepository implements OptionVariableRepositoryInterface
+class EggVariableRepository extends EloquentRepository implements EggVariableRepositoryInterface
 {
     /**
      * {@inheritdoc}
      */
     public function model()
     {
-        return ServiceVariable::class;
+        return EggVariable::class;
     }
 }

app/Repositories/Eloquent/EloquentRepository.php

@@ -249,6 +249,10 @@ abstract class EloquentRepository extends Repository implements RepositoryInterf
         Assert::boolean($validate, 'Third argument passed to updateOrCreate must be boolean, received %s.');
         Assert::boolean($force, 'Fourth argument passed to updateOrCreate must be boolean, received %s.');
 
+        foreach ($where as $item) {
+            Assert::true(is_scalar($item) || is_null($item), 'First argument passed to updateOrCreate should be an array of scalar or null values, received an array value of %s.');
+        }
+
         $instance = $this->withColumns('id')->findWhere($where)->first();
 
         if (! $instance) {

app/Repositories/Eloquent/NestRepository.php

@@ -0,0 +1,92 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Repositories\Eloquent;
+
+use Pterodactyl\Models\Nest;
+use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
+use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
+
+class NestRepository extends EloquentRepository implements NestRepositoryInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function model()
+    {
+        return Nest::class;
+    }
+
+    /**
+     * Return a nest or all nests with their associated eggs, variables, and packs.
+     *
+     * @param int $id
+     * @return \Illuminate\Database\Eloquent\Collection|\Pterodactyl\Models\Nest
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function getWithEggs(int $id = null)
+    {
+        $instance = $this->getBuilder()->with('eggs.packs', 'eggs.variables');
+
+        if (! is_null($id)) {
+            $instance = $instance->find($id, $this->getColumns());
+            if (! $instance) {
+                throw new RecordNotFoundException;
+            }
+
+            return $instance;
+        }
+
+        return $instance->get($this->getColumns());
+    }
+
+    /**
+     * Return a nest or all nests and the count of eggs, packs, and servers for that nest.
+     *
+     * @param int|null $id
+     * @return \Pterodactyl\Models\Nest|\Illuminate\Database\Eloquent\Collection
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function getWithCounts(int $id = null)
+    {
+        $instance = $this->getBuilder()->withCount(['eggs', 'packs', 'servers']);
+
+        if (! is_null($id)) {
+            $instance = $instance->find($id, $this->getColumns());
+            if (! $instance) {
+                throw new RecordNotFoundException;
+            }
+
+            return $instance;
+        }
+
+        return $instance->get($this->getColumns());
+    }
+
+    /**
+     * Return a nest along with its associated eggs and the servers relation on those eggs.
+     *
+     * @param int $id
+     * @return \Pterodactyl\Models\Nest
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function getWithEggServers(int $id): Nest
+    {
+        $instance = $this->getBuilder()->with('eggs.servers')->find($id, $this->getColumns());
+        if (! $instance) {
+            throw new RecordNotFoundException;
+        }
+
+        /* @var Nest $instance */
+        return $instance;
+    }
+}

app/Repositories/Eloquent/NodeRepository.php

@@ -116,7 +116,7 @@ class NodeRepository extends EloquentRepository implements NodeRepositoryInterfa
      */
     public function getNodeServers($id)
     {
-        $instance = $this->getBuilder()->with('servers.user', 'servers.service', 'servers.option')
+        $instance = $this->getBuilder()->with('servers.user', 'servers.nest', 'servers.egg')
             ->find($id, $this->getColumns());
 
         if (! $instance) {

app/Repositories/Eloquent/PackRepository.php

@@ -75,11 +75,11 @@ class PackRepository extends EloquentRepository implements PackRepositoryInterfa
     /**
      * {@inheritdoc}
      */
-    public function paginateWithOptionAndServerCount($paginate = 50)
+    public function paginateWithEggAndServerCount($paginate = 50)
     {
         Assert::integer($paginate, 'First argument passed to paginateWithOptionAndServerCount must be integer, received %s.');
 
-        return $this->getBuilder()->with('option')->withCount('servers')
+        return $this->getBuilder()->with('egg')->withCount('servers')
             ->search($this->searchTerm)
             ->paginate($paginate, $this->getColumns());
     }

app/Repositories/Eloquent/ServerRepository.php

@@ -47,7 +47,7 @@ class ServerRepository extends EloquentRepository implements ServerRepositoryInt
         Assert::nullOrIntegerish($server, 'First argument passed to getDataForRebuild must be null or integer, received %s.');
         Assert::nullOrIntegerish($node, 'Second argument passed to getDataForRebuild must be null or integer, received %s.');
 
-        $instance = $this->getBuilder()->with('node', 'option.service', 'pack');
+        $instance = $this->getBuilder()->with('allocation', 'allocations', 'pack', 'egg', 'node');
 
         if (! is_null($server) && is_null($node)) {
             $instance = $instance->where('id', '=', $server);
@@ -66,7 +66,7 @@ class ServerRepository extends EloquentRepository implements ServerRepositoryInt
     {
         Assert::integerish($id, 'First argument passed to findWithVariables must be integer, received %s.');
 
-        $instance = $this->getBuilder()->with('option.variables', 'variables')
+        $instance = $this->getBuilder()->with('egg.variables', 'variables')
                          ->where($this->getModel()->getKeyName(), '=', $id)
                          ->first($this->getColumns());
 
@@ -82,7 +82,7 @@ class ServerRepository extends EloquentRepository implements ServerRepositoryInt
      */
     public function getVariablesWithValues($id, $returnWithObject = false)
     {
-        $instance = $this->getBuilder()->with('variables', 'option.variables')
+        $instance = $this->getBuilder()->with('variables', 'egg.variables')
                          ->find($id, $this->getColumns());
 
         if (! $instance) {
@@ -90,7 +90,7 @@ class ServerRepository extends EloquentRepository implements ServerRepositoryInt
         }
 
         $data = [];
-        $instance->option->variables->each(function ($item) use (&$data, $instance) {
+        $instance->egg->variables->each(function ($item) use (&$data, $instance) {
             $display = $instance->variables->where('variable_id', $item->id)->pluck('variable_value')->first();
 
             $data[$item->env_variable] = $display ?? $item->default_value;
@@ -111,9 +111,7 @@ class ServerRepository extends EloquentRepository implements ServerRepositoryInt
      */
     public function getDataForCreation($id)
     {
-        $instance = $this->getBuilder()->with('allocation', 'allocations', 'pack', 'option.service')
-                         ->find($id, $this->getColumns());
-
+        $instance = $this->getBuilder()->with(['allocation', 'allocations', 'pack', 'egg'])->find($id, $this->getColumns());
         if (! $instance) {
             throw new RecordNotFoundException();
         }
@@ -142,15 +140,16 @@ class ServerRepository extends EloquentRepository implements ServerRepositoryInt
      */
     public function getDaemonServiceData($id)
     {
-        $instance = $this->getBuilder()->with('option.service', 'pack')->find($id, $this->getColumns());
+        Assert::integerish($id, 'First argument passed to getDaemonServiceData must be integer, received %s.');
 
+        $instance = $this->getBuilder()->with('egg.nest', 'pack')->find($id, $this->getColumns());
         if (! $instance) {
             throw new RecordNotFoundException();
         }
 
         return [
-            'type' => $instance->option->service->folder,
-            'option' => $instance->option->tag,
+            'type' => $instance->egg->nest->folder,
+            'option' => $instance->egg->tag,
             'pack' => (! is_null($instance->pack_id)) ? $instance->pack->uuid : null,
         ];
     }
@@ -213,7 +212,7 @@ class ServerRepository extends EloquentRepository implements ServerRepositoryInt
     {
         Assert::stringNotEmpty($uuid, 'First argument passed to getByUuid must be a non-empty string, received %s.');
 
-        $instance = $this->getBuilder()->with('service', 'node')->where(function ($query) use ($uuid) {
+        $instance = $this->getBuilder()->with('nest', 'node')->where(function ($query) use ($uuid) {
             $query->where('uuidShort', $uuid)->orWhere('uuid', $uuid);
         })->first($this->getColumns());
 

app/Repositories/Eloquent/ServiceOptionRepository.php

@@ -1,51 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Repositories\Eloquent;
-
-use Pterodactyl\Models\ServiceOption;
-use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
-
-class ServiceOptionRepository extends EloquentRepository implements ServiceOptionRepositoryInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function model()
-    {
-        return ServiceOption::class;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getWithVariables($id)
-    {
-        return $this->getBuilder()->with('variables')->find($id, $this->getColumns());
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getWithCopyFrom($id)
-    {
-        return $this->getBuilder()->with('copyFrom')->find($id, $this->getColumns());
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isCopiableScript($copyFromId, $service)
-    {
-        return $this->getBuilder()->whereNull('copy_script_from')
-            ->where('id', '=', $copyFromId)
-            ->where('service_id', '=', $service)
-            ->exists();
-    }
-}

app/Repositories/Eloquent/ServiceRepository.php

@@ -1,62 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Repositories\Eloquent;
-
-use Webmozart\Assert\Assert;
-use Pterodactyl\Models\Service;
-use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
-use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
-
-class ServiceRepository extends EloquentRepository implements ServiceRepositoryInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function model()
-    {
-        return Service::class;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getWithOptions($id = null)
-    {
-        Assert::nullOrNumeric($id, 'First argument passed to getWithOptions must be null or numeric, received %s.');
-
-        $instance = $this->getBuilder()->with('options.packs', 'options.variables');
-
-        if (! is_null($id)) {
-            $instance = $instance->find($id, $this->getColumns());
-            if (! $instance) {
-                throw new RecordNotFoundException();
-            }
-
-            return $instance;
-        }
-
-        return $instance->get($this->getColumns());
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getWithOptionServers($id)
-    {
-        Assert::numeric($id, 'First argument passed to getWithOptionServers must be numeric, received %s.');
-
-        $instance = $this->getBuilder()->with('options.servers')->find($id, $this->getColumns());
-        if (! $instance) {
-            throw new RecordNotFoundException();
-        }
-
-        return $instance;
-    }
-}

app/Repositories/Eloquent/ServiceVariableRepository.php

@@ -1,24 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Repositories\Eloquent;
-
-use Pterodactyl\Models\ServiceVariable;
-use Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface;
-
-class ServiceVariableRepository extends EloquentRepository implements ServiceVariableRepositoryInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function model()
-    {
-        return ServiceVariable::class;
-    }
-}

app/Repositories/Wings/ServerRepository.php

@@ -9,6 +9,7 @@
 
 namespace Pterodactyl\Repositories\Wings;
 
+use Psr\Http\Message\ResponseInterface;
 use Pterodactyl\Exceptions\PterodactylException;
 use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface;
 
@@ -17,7 +18,7 @@ class ServerRepository extends BaseRepository implements ServerRepositoryInterfa
     /**
      * {@inheritdoc}
      */
-    public function create($id, array $overrides = [], $start = false)
+    public function create(array $structure, array $overrides = []): ResponseInterface
     {
         throw new PterodactylException('This feature is not yet implemented.');
     }

app/Services/Eggs/EggConfigurationService.php

@@ -0,0 +1,54 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Services\Eggs;
+
+use Pterodactyl\Models\Egg;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
+
+class EggConfigurationService
+{
+    /**
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * EggConfigurationService constructor.
+     *
+     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $repository
+     */
+    public function __construct(EggRepositoryInterface $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    /**
+     * Return an Egg file to be used by the Daemon.
+     *
+     * @param int|\Pterodactyl\Models\Egg $egg
+     * @return array
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function handle($egg): array
+    {
+        if (! $egg instanceof Egg) {
+            $egg = $this->repository->getWithCopyAttributes($egg);
+        }
+
+        return [
+            'startup' => json_decode($egg->inherit_config_startup),
+            'stop' => $egg->inherit_config_stop,
+            'configs' => json_decode($egg->inherit_config_files),
+            'log' => json_decode($egg->inherit_config_logs),
+            'query' => 'none',
+        ];
+    }
+}

app/Services/Eggs/EggCreationService.php

@@ -0,0 +1,71 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Services\Eggs;
+
+use Ramsey\Uuid\Uuid;
+use Pterodactyl\Models\Egg;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
+use Illuminate\Contracts\Config\Repository as ConfigRepository;
+use Pterodactyl\Exceptions\Service\Egg\NoParentConfigurationFoundException;
+
+// When a mommy and a daddy pterodactyl really like eachother...
+class EggCreationService
+{
+    /**
+     * @var \Illuminate\Contracts\Config\Repository
+     */
+    protected $config;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * EggCreationService constructor.
+     *
+     * @param \Illuminate\Contracts\Config\Repository                  $config
+     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $repository
+     */
+    public function __construct(ConfigRepository $config, EggRepositoryInterface $repository)
+    {
+        $this->config = $config;
+        $this->repository = $repository;
+    }
+
+    /**
+     * Create a new service option and assign it to the given service.
+     *
+     * @param array $data
+     * @return \Pterodactyl\Models\Egg
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\NoParentConfigurationFoundException
+     */
+    public function handle(array $data): Egg
+    {
+        $data['config_from'] = array_get($data, 'config_from');
+        if (! is_null($data['config_from'])) {
+            $results = $this->repository->findCountWhere([
+                ['nest_id', '=', array_get($data, 'nest_id')],
+                ['id', '=', array_get($data, 'config_from')],
+            ]);
+
+            if ($results !== 1) {
+                throw new NoParentConfigurationFoundException(trans('exceptions.nest.egg.must_be_child'));
+            }
+        }
+
+        return $this->repository->create(array_merge($data, [
+            'uuid' => Uuid::uuid4()->toString(),
+            'author' => $this->config->get('pterodactyl.service.author'),
+        ]), true, true);
+    }
+}

app/Services/Eggs/EggDeletionService.php

@@ -0,0 +1,66 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Services\Eggs;
+
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
+use Pterodactyl\Exceptions\Service\Egg\HasChildrenException;
+use Pterodactyl\Exceptions\Service\HasActiveServersException;
+use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
+
+class EggDeletionService
+{
+    /**
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
+     */
+    protected $serverRepository;
+
+    /**
+     * EggDeletionService constructor.
+     *
+     * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $serverRepository
+     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface    $repository
+     */
+    public function __construct(
+        ServerRepositoryInterface $serverRepository,
+        EggRepositoryInterface $repository
+    ) {
+        $this->repository = $repository;
+        $this->serverRepository = $serverRepository;
+    }
+
+    /**
+     * Delete an Egg from the database if it has no active servers attached to it.
+     *
+     * @param int $egg
+     * @return int
+     *
+     * @throws \Pterodactyl\Exceptions\Service\HasActiveServersException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\HasChildrenException
+     */
+    public function handle(int $egg): int
+    {
+        $servers = $this->serverRepository->findCountWhere([['egg_id', '=', $egg]]);
+        if ($servers > 0) {
+            throw new HasActiveServersException(trans('exceptions.nest.egg.delete_has_servers'));
+        }
+
+        $children = $this->repository->findCountWhere([['config_from', '=', $egg]]);
+        if ($children > 0) {
+            throw new HasChildrenException(trans('exceptions.nest.egg.has_children'));
+        }
+
+        return $this->repository->delete($egg);
+    }
+}

app/Services/Eggs/EggUpdateService.php

@@ -0,0 +1,62 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Services\Eggs;
+
+use Pterodactyl\Models\Egg;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
+use Pterodactyl\Exceptions\Service\Egg\NoParentConfigurationFoundException;
+
+class EggUpdateService
+{
+    /**
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * EggUpdateService constructor.
+     *
+     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $repository
+     */
+    public function __construct(EggRepositoryInterface $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    /**
+     * Update a service option.
+     *
+     * @param int|\Pterodactyl\Models\Egg $egg
+     * @param array                       $data
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\NoParentConfigurationFoundException
+     */
+    public function handle($egg, array $data)
+    {
+        if (! $egg instanceof Egg) {
+            $egg = $this->repository->find($egg);
+        }
+
+        if (! is_null(array_get($data, 'config_from'))) {
+            $results = $this->repository->findCountWhere([
+                ['nest_id', '=', $egg->nest_id],
+                ['id', '=', array_get($data, 'config_from')],
+            ]);
+
+            if ($results !== 1) {
+                throw new NoParentConfigurationFoundException(trans('exceptions.nest.egg.must_be_child'));
+            }
+        }
+
+        $this->repository->withoutFresh()->update($egg->id, $data);
+    }
+}

app/Services/Eggs/Scripts/InstallScriptService.php

@@ -0,0 +1,63 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Services\Eggs\Scripts;
+
+use Pterodactyl\Models\Egg;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
+use Pterodactyl\Exceptions\Service\Egg\InvalidCopyFromException;
+
+class InstallScriptService
+{
+    /**
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * InstallScriptService constructor.
+     *
+     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $repository
+     */
+    public function __construct(EggRepositoryInterface $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    /**
+     * Modify the install script for a given Egg.
+     *
+     * @param int|\Pterodactyl\Models\Egg $egg
+     * @param array                       $data
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\InvalidCopyFromException
+     */
+    public function handle($egg, array $data)
+    {
+        if (! $egg instanceof Egg) {
+            $egg = $this->repository->find($egg);
+        }
+
+        if (! is_null(array_get($data, 'copy_script_from'))) {
+            if (! $this->repository->isCopiableScript(array_get($data, 'copy_script_from'), $egg->nest_id)) {
+                throw new InvalidCopyFromException(trans('exceptions.nest.egg.invalid_copy_id'));
+            }
+        }
+
+        $this->repository->withoutFresh()->update($egg->id, [
+            'script_install' => array_get($data, 'script_install'),
+            'script_is_privileged' => array_get($data, 'script_is_privileged', 1),
+            'script_entry' => array_get($data, 'script_entry'),
+            'script_container' => array_get($data, 'script_container'),
+            'copy_script_from' => array_get($data, 'copy_script_from'),
+        ]);
+    }
+}

app/Services/Eggs/Sharing/EggExporterService.php

@@ -0,0 +1,77 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Services\Eggs\Sharing;
+
+use Carbon\Carbon;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
+
+class EggExporterService
+{
+    /**
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * EggExporterService constructor.
+     *
+     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $repository
+     */
+    public function __construct(EggRepositoryInterface $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    /**
+     * Return a JSON representation of an egg and its variables.
+     *
+     * @param int $egg
+     * @return string
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function handle(int $egg): string
+    {
+        $egg = $this->repository->getWithExportAttributes($egg);
+
+        $struct = [
+            '_comment' => 'DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO',
+            'meta' => [
+                'version' => 'PTDL_v1',
+            ],
+            'exported_at' => Carbon::now()->toIso8601String(),
+            'name' => $egg->name,
+            'author' => $egg->author,
+            'description' => $egg->description,
+            'image' => $egg->docker_image,
+            'startup' => $egg->startup,
+            'config' => [
+                'files' => $egg->inherit_config_files,
+                'startup' => $egg->inherit_config_startup,
+                'logs' => $egg->inherit_config_logs,
+                'stop' => $egg->inherit_config_stop,
+            ],
+            'scripts' => [
+                'installation' => [
+                    'script' => $egg->copy_script_install,
+                    'container' => $egg->copy_script_container,
+                    'entrypoint' => $egg->copy_script_entry,
+                ],
+            ],
+            'variables' => $egg->variables->transform(function ($item) {
+                return collect($item->toArray())->except([
+                    'id', 'egg_id', 'created_at', 'updated_at',
+                ])->toArray();
+            }),
+        ];
+
+        return json_encode($struct, JSON_PRETTY_PRINT);
+    }
+}

app/Services/Eggs/Sharing/EggImporterService.php

@@ -0,0 +1,124 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Services\Eggs\Sharing;
+
+use Ramsey\Uuid\Uuid;
+use Pterodactyl\Models\Egg;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Database\ConnectionInterface;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
+use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
+use Pterodactyl\Exceptions\Service\Egg\BadJsonFormatException;
+use Pterodactyl\Exceptions\Service\InvalidFileUploadException;
+use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
+
+class EggImporterService
+{
+    /**
+     * @var \Illuminate\Database\ConnectionInterface
+     */
+    protected $connection;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface
+     */
+    protected $eggVariableRepository;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
+     */
+    protected $nestRepository;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * EggImporterService constructor.
+     *
+     * @param \Illuminate\Database\ConnectionInterface                         $connection
+     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface         $repository
+     * @param \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface $eggVariableRepository
+     * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface        $nestRepository
+     */
+    public function __construct(
+        ConnectionInterface $connection,
+        EggRepositoryInterface $repository,
+        EggVariableRepositoryInterface $eggVariableRepository,
+        NestRepositoryInterface $nestRepository
+    ) {
+        $this->connection = $connection;
+        $this->eggVariableRepository = $eggVariableRepository;
+        $this->repository = $repository;
+        $this->nestRepository = $nestRepository;
+    }
+
+    /**
+     * Take an uploaded JSON file and parse it into a new egg.
+     *
+     * @param \Illuminate\Http\UploadedFile $file
+     * @param int                           $nest
+     * @return \Pterodactyl\Models\Egg
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\BadJsonFormatException
+     * @throws \Pterodactyl\Exceptions\Service\InvalidFileUploadException
+     */
+    public function handle(UploadedFile $file, int $nest): Egg
+    {
+        if (! $file->isValid() || ! $file->isFile()) {
+            throw new InvalidFileUploadException(trans('exceptions.nest.importer.file_error'));
+        }
+
+        $parsed = json_decode($file->openFile()->fread($file->getSize()));
+        if (json_last_error() !== 0) {
+            throw new BadJsonFormatException(trans('exceptions.nest.importer.json_error', [
+                'error' => json_last_error_msg(),
+            ]));
+        }
+
+        if (object_get($parsed, 'meta.version') !== 'PTDL_v1') {
+            throw new InvalidFileUploadException(trans('exceptions.nest.importer.invalid_json_provided'));
+        }
+
+        $nest = $this->nestRepository->getWithEggs($nest);
+        $this->connection->beginTransaction();
+
+        $egg = $this->repository->create([
+            'uuid' => Uuid::uuid4()->toString(),
+            'nest_id' => $nest->id,
+            'author' => object_get($parsed, 'author'),
+            'name' => object_get($parsed, 'name'),
+            'description' => object_get($parsed, 'description'),
+            'docker_image' => object_get($parsed, 'image'),
+            'config_files' => object_get($parsed, 'config.files'),
+            'config_startup' => object_get($parsed, 'config.startup'),
+            'config_logs' => object_get($parsed, 'config.logs'),
+            'config_stop' => object_get($parsed, 'config.stop'),
+            'startup' => object_get($parsed, 'startup'),
+            'script_install' => object_get($parsed, 'scripts.installation.script'),
+            'script_entry' => object_get($parsed, 'scripts.installation.entrypoint'),
+            'script_container' => object_get($parsed, 'scripts.installation.container'),
+            'copy_script_from' => null,
+        ], true, true);
+
+        collect($parsed->variables)->each(function ($variable) use ($egg) {
+            $this->eggVariableRepository->create(array_merge((array) $variable, [
+                'egg_id' => $egg->id,
+            ]));
+        });
+
+        $this->connection->commit();
+
+        return $egg;
+    }
+}

app/Services/Eggs/Sharing/EggUpdateImporterService.php

@@ -0,0 +1,113 @@
+<?php
+
+namespace Pterodactyl\Services\Eggs\Sharing;
+
+use Illuminate\Http\UploadedFile;
+use Illuminate\Database\ConnectionInterface;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
+use Pterodactyl\Exceptions\Service\Egg\BadJsonFormatException;
+use Pterodactyl\Exceptions\Service\InvalidFileUploadException;
+use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
+
+class EggUpdateImporterService
+{
+    /**
+     * @var \Illuminate\Database\ConnectionInterface
+     */
+    protected $connection;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface
+     */
+    protected $variableRepository;
+
+    /**
+     * EggUpdateImporterService constructor.
+     *
+     * @param \Illuminate\Database\ConnectionInterface                         $connection
+     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface         $repository
+     * @param \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface $variableRepository
+     */
+    public function __construct(
+        ConnectionInterface $connection,
+        EggRepositoryInterface $repository,
+        EggVariableRepositoryInterface $variableRepository
+    ) {
+        $this->connection = $connection;
+        $this->repository = $repository;
+        $this->variableRepository = $variableRepository;
+    }
+
+    /**
+     * Update an existing Egg using an uploaded JSON file.
+     *
+     * @param int                           $egg
+     * @param \Illuminate\Http\UploadedFile $file
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\BadJsonFormatException
+     * @throws \Pterodactyl\Exceptions\Service\InvalidFileUploadException
+     */
+    public function handle(int $egg, UploadedFile $file)
+    {
+        if (! $file->isValid() || ! $file->isFile()) {
+            throw new InvalidFileUploadException(trans('exceptions.nest.importer.file_error'));
+        }
+
+        $parsed = json_decode($file->openFile()->fread($file->getSize()));
+        if (json_last_error() !== 0) {
+            throw new BadJsonFormatException(trans('exceptions.nest.importer.json_error', [
+                'error' => json_last_error_msg(),
+            ]));
+        }
+
+        if (object_get($parsed, 'meta.version') !== 'PTDL_v1') {
+            throw new InvalidFileUploadException(trans('exceptions.nest.importer.invalid_json_provided'));
+        }
+
+        $this->connection->beginTransaction();
+        $this->repository->update($egg, [
+            'author' => object_get($parsed, 'author'),
+            'name' => object_get($parsed, 'name'),
+            'description' => object_get($parsed, 'description'),
+            'docker_image' => object_get($parsed, 'image'),
+            'config_files' => object_get($parsed, 'config.files'),
+            'config_startup' => object_get($parsed, 'config.startup'),
+            'config_logs' => object_get($parsed, 'config.logs'),
+            'config_stop' => object_get($parsed, 'config.stop'),
+            'startup' => object_get($parsed, 'startup'),
+            'script_install' => object_get($parsed, 'scripts.installation.script'),
+            'script_entry' => object_get($parsed, 'scripts.installation.entrypoint'),
+            'script_container' => object_get($parsed, 'scripts.installation.container'),
+        ], true, true);
+
+        // Update Existing Variables
+        collect($parsed->variables)->each(function ($variable) use ($egg) {
+            $this->variableRepository->withoutFresh()->updateOrCreate([
+                'egg_id' => $egg,
+                'env_variable' => $variable->env_variable,
+            ], collect($variable)->except(['egg_id', 'env_variable'])->toArray());
+        });
+
+        $imported = collect($parsed->variables)->pluck('env_variable')->toArray();
+        $existing = $this->variableRepository->withColumns(['id', 'env_variable'])->findWhere([['egg_id', '=', $egg]]);
+
+        // Delete variables not present in the import.
+        collect($existing)->each(function ($variable) use ($egg, $imported) {
+            if (! in_array($variable->env_variable, $imported)) {
+                $this->variableRepository->deleteWhere([
+                    ['egg_id', '=', $egg],
+                    ['env_variable', '=', $variable->env_variable],
+                ]);
+            }
+        });
+
+        $this->connection->commit();
+    }
+}

app/Services/Eggs/Variables/VariableCreationService.php

@@ -0,0 +1,60 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Services\Eggs\Variables;
+
+use Pterodactyl\Models\EggVariable;
+use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
+use Pterodactyl\Exceptions\Service\Egg\Variable\ReservedVariableNameException;
+
+class VariableCreationService
+{
+    /**
+     * @var \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * VariableCreationService constructor.
+     *
+     * @param \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface $repository
+     */
+    public function __construct(EggVariableRepositoryInterface $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    /**
+     * Create a new variable for a given Egg.
+     *
+     * @param int   $egg
+     * @param array $data
+     * @return \Pterodactyl\Models\EggVariable
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\Variable\ReservedVariableNameException
+     */
+    public function handle(int $egg, array $data): EggVariable
+    {
+        if (in_array(strtoupper(array_get($data, 'env_variable')), explode(',', EggVariable::RESERVED_ENV_NAMES))) {
+            throw new ReservedVariableNameException(sprintf(
+                'Cannot use the protected name %s for this environment variable.',
+                array_get($data, 'env_variable')
+            ));
+        }
+
+        $options = array_get($data, 'options', []);
+
+        return $this->repository->create(array_merge($data, [
+            'egg_id' => $egg,
+            'user_viewable' => in_array('user_viewable', $options),
+            'user_editable' => in_array('user_editable', $options),
+        ]));
+    }
+}

app/Services/Eggs/Variables/VariableUpdateService.php

@@ -7,50 +7,50 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Services\Services\Variables;
+namespace Pterodactyl\Services\Eggs\Variables;
 
-use Pterodactyl\Models\ServiceVariable;
+use Pterodactyl\Models\EggVariable;
 use Pterodactyl\Exceptions\DisplayException;
-use Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface;
-use Pterodactyl\Exceptions\Service\ServiceVariable\ReservedVariableNameException;
+use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
+use Pterodactyl\Exceptions\Service\Egg\Variable\ReservedVariableNameException;
 
 class VariableUpdateService
 {
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface
      */
     protected $repository;
 
     /**
      * VariableUpdateService constructor.
      *
-     * @param \Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface $repository
+     * @param \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface $repository
      */
-    public function __construct(ServiceVariableRepositoryInterface $repository)
+    public function __construct(EggVariableRepositoryInterface $repository)
     {
         $this->repository = $repository;
     }
 
     /**
-     * Update a specific service variable.
+     * Update a specific egg variable.
      *
-     * @param int|\Pterodactyl\Models\ServiceVariable $variable
-     * @param array                                   $data
+     * @param int|\Pterodactyl\Models\EggVariable $variable
+     * @param array                               $data
      * @return mixed
      *
      * @throws \Pterodactyl\Exceptions\DisplayException
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     * @throws \Pterodactyl\Exceptions\Service\ServiceVariable\ReservedVariableNameException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\Variable\ReservedVariableNameException
      */
     public function handle($variable, array $data)
     {
-        if (! $variable instanceof ServiceVariable) {
+        if (! $variable instanceof EggVariable) {
             $variable = $this->repository->find($variable);
         }
 
         if (! is_null(array_get($data, 'env_variable'))) {
-            if (in_array(strtoupper(array_get($data, 'env_variable')), explode(',', ServiceVariable::RESERVED_ENV_NAMES))) {
+            if (in_array(strtoupper(array_get($data, 'env_variable')), explode(',', EggVariable::RESERVED_ENV_NAMES))) {
                 throw new ReservedVariableNameException(trans('exceptions.service.variables.reserved_name', [
                     'name' => array_get($data, 'env_variable'),
                 ]));
@@ -58,7 +58,7 @@ class VariableUpdateService
 
             $search = $this->repository->withColumns('id')->findCountWhere([
                 ['env_variable', '=', array_get($data, 'env_variable')],
-                ['option_id', '=', $variable->option_id],
+                ['egg_id', '=', $variable->egg_id],
                 ['id', '!=', $variable->id],
             ]);
 
@@ -71,9 +71,9 @@ class VariableUpdateService
 
         $options = array_get($data, 'options', []);
 
-        return $this->repository->withoutFresh()->update($variable->id, array_merge([
+        return $this->repository->withoutFresh()->update($variable->id, array_merge($data, [
             'user_viewable' => in_array('user_viewable', $options),
             'user_editable' => in_array('user_editable', $options),
-        ], $data));
+        ]));
     }
 }

app/Services/Nests/NestCreationService.php

@@ -0,0 +1,58 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Services\Nests;
+
+use Ramsey\Uuid\Uuid;
+use Pterodactyl\Models\Nest;
+use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
+use Illuminate\Contracts\Config\Repository as ConfigRepository;
+
+class NestCreationService
+{
+    /**
+     * @var \Illuminate\Contracts\Config\Repository
+     */
+    protected $config;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * NestCreationService constructor.
+     *
+     * @param \Illuminate\Contracts\Config\Repository                   $config
+     * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface $repository
+     */
+    public function __construct(ConfigRepository $config, NestRepositoryInterface $repository)
+    {
+        $this->config = $config;
+        $this->repository = $repository;
+    }
+
+    /**
+     * Create a new nest on the system.
+     *
+     * @param array $data
+     * @return \Pterodactyl\Models\Nest
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     */
+    public function handle(array $data): Nest
+    {
+        return $this->repository->create([
+            'uuid' => Uuid::uuid4()->toString(),
+            'author' => $this->config->get('pterodactyl.service.author'),
+            'name' => array_get($data, 'name'),
+            'description' => array_get($data, 'description'),
+        ], true, true);
+    }
+}

app/Services/Nests/NestDeletionService.php

@@ -7,13 +7,13 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Services\Services;
+namespace Pterodactyl\Services\Nests;
 
+use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
 use Pterodactyl\Exceptions\Service\HasActiveServersException;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
-use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
 
-class ServiceDeletionService
+class NestDeletionService
 {
     /**
      * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
@@ -21,39 +21,39 @@ class ServiceDeletionService
     protected $serverRepository;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
      */
     protected $repository;
 
     /**
-     * ServiceDeletionService constructor.
+     * NestDeletionService constructor.
      *
-     * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface  $serverRepository
-     * @param \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface $repository
+     * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $serverRepository
+     * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface   $repository
      */
     public function __construct(
         ServerRepositoryInterface $serverRepository,
-        ServiceRepositoryInterface $repository
+        NestRepositoryInterface $repository
     ) {
         $this->serverRepository = $serverRepository;
         $this->repository = $repository;
     }
 
     /**
-     * Delete a service from the system only if there are no servers attached to it.
+     * Delete a nest from the system only if there are no servers attached to it.
      *
-     * @param int $service
+     * @param int $nest
      * @return int
      *
      * @throws \Pterodactyl\Exceptions\Service\HasActiveServersException
      */
-    public function handle($service)
+    public function handle(int $nest): int
     {
-        $count = $this->serverRepository->findCountWhere([['service_id', '=', $service]]);
+        $count = $this->serverRepository->findCountWhere([['nest_id', '=', $nest]]);
         if ($count > 0) {
             throw new HasActiveServersException(trans('exceptions.service.delete_has_servers'));
         }
 
-        return $this->repository->delete($service);
+        return $this->repository->delete($nest);
     }
 }

app/Services/Nests/NestUpdateService.php

@@ -7,41 +7,41 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Services\Services;
+namespace Pterodactyl\Services\Nests;
 
-use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
+use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
 
-class ServiceUpdateService
+class NestUpdateService
 {
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
      */
     protected $repository;
 
     /**
-     * ServiceUpdateService constructor.
+     * NestUpdateService constructor.
      *
-     * @param \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface $repository
+     * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface $repository
      */
-    public function __construct(ServiceRepositoryInterface $repository)
+    public function __construct(NestRepositoryInterface $repository)
     {
         $this->repository = $repository;
     }
 
     /**
-     * Update a service and prevent changing the author once it is set.
+     * Update a nest and prevent changing the author once it is set.
      *
-     * @param int   $service
+     * @param int   $nest
      * @param array $data
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function handle($service, array $data)
+    public function handle(int $nest, array $data)
     {
         if (! is_null(array_get($data, 'author'))) {
             unset($data['author']);
         }
 
-        $this->repository->withoutFresh()->update($service, $data);
+        $this->repository->withoutFresh()->update($nest, $data);
     }
 }

app/Services/Packs/PackCreationService.php

@@ -13,8 +13,8 @@ use Ramsey\Uuid\Uuid;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Database\ConnectionInterface;
 use Pterodactyl\Contracts\Repository\PackRepositoryInterface;
+use Pterodactyl\Exceptions\Service\InvalidFileUploadException;
 use Illuminate\Contracts\Filesystem\Factory as FilesystemFactory;
-use Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException;
 use Pterodactyl\Exceptions\Service\Pack\InvalidFileMimeTypeException;
 
 class PackCreationService
@@ -65,7 +65,7 @@ class PackCreationService
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileMimeTypeException
-     * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException
+     * @throws \Pterodactyl\Exceptions\Service\InvalidFileUploadException
      */
     public function handle(array $data, UploadedFile $file = null)
     {

app/Services/Packs/PackUpdateService.php

@@ -54,10 +54,10 @@ class PackUpdateService
     public function handle($pack, array $data)
     {
         if (! $pack instanceof Pack) {
-            $pack = $this->repository->withColumns(['id', 'option_id'])->find($pack);
+            $pack = $this->repository->withColumns(['id', 'egg_id'])->find($pack);
         }
 
-        if ((int) array_get($data, 'option_id', $pack->option_id) !== $pack->option_id) {
+        if ((int) array_get($data, 'egg_id', $pack->egg_id) !== $pack->egg_id) {
             $count = $this->serverRepository->findCountWhere([['pack_id', '=', $pack->id]]);
 
             if ($count !== 0) {

app/Services/Packs/TemplateUploadService.php

@@ -11,8 +11,8 @@ namespace Pterodactyl\Services\Packs;
 
 use ZipArchive;
 use Illuminate\Http\UploadedFile;
+use Pterodactyl\Exceptions\Service\InvalidFileUploadException;
 use Pterodactyl\Exceptions\Service\Pack\ZipExtractionException;
-use Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException;
 use Pterodactyl\Exceptions\Service\Pack\InvalidFileMimeTypeException;
 use Pterodactyl\Exceptions\Service\Pack\UnreadableZipArchiveException;
 use Pterodactyl\Exceptions\Service\Pack\InvalidPackArchiveFormatException;
@@ -52,18 +52,18 @@ class TemplateUploadService
     /**
      * Process an uploaded file to create a new pack from a JSON or ZIP format.
      *
-     * @param int                           $option
+     * @param int                           $egg
      * @param \Illuminate\Http\UploadedFile $file
      * @return \Pterodactyl\Models\Pack
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Service\Pack\ZipExtractionException
-     * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException
+     * @throws \Pterodactyl\Exceptions\Service\InvalidFileUploadException
      * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileMimeTypeException
      * @throws \Pterodactyl\Exceptions\Service\Pack\UnreadableZipArchiveException
      * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidPackArchiveFormatException
      */
-    public function handle($option, UploadedFile $file)
+    public function handle($egg, UploadedFile $file)
     {
         if (! $file->isValid()) {
             throw new InvalidFileUploadException(trans('exceptions.packs.invalid_upload'));
@@ -76,10 +76,10 @@ class TemplateUploadService
         }
 
         if ($file->getMimeType() === 'application/zip') {
-            return $this->handleArchive($option, $file);
+            return $this->handleArchive($egg, $file);
         } else {
             $json = json_decode($file->openFile()->fread($file->getSize()), true);
-            $json['option_id'] = $option;
+            $json['egg_id'] = $egg;
 
             return $this->creationService->handle($json);
         }
@@ -88,18 +88,18 @@ class TemplateUploadService
     /**
      * Process a ZIP file to create a pack and stored archive.
      *
-     * @param int                           $option
+     * @param int                           $egg
      * @param \Illuminate\Http\UploadedFile $file
      * @return \Pterodactyl\Models\Pack
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Service\Pack\ZipExtractionException
-     * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException
+     * @throws \Pterodactyl\Exceptions\Service\InvalidFileUploadException
      * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileMimeTypeException
      * @throws \Pterodactyl\Exceptions\Service\Pack\UnreadableZipArchiveException
      * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidPackArchiveFormatException
      */
-    protected function handleArchive($option, $file)
+    protected function handleArchive($egg, $file)
     {
         if (! $this->archive->open($file->getRealPath())) {
             throw new UnreadableZipArchiveException(trans('exceptions.packs.unreadable'));
@@ -110,7 +110,7 @@ class TemplateUploadService
         }
 
         $json = json_decode($this->archive->getFromName('import.json'), true);
-        $json['option_id'] = $option;
+        $json['egg_id'] = $egg;
 
         $pack = $this->creationService->handle($json);
         if (! $this->archive->extractTo(storage_path('app/packs/' . $pack->uuid), 'archive.tar.gz')) {

app/Services/Servers/ServerConfigurationStructureService.php

@@ -0,0 +1,83 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Services\Servers;
+
+use Pterodactyl\Models\Server;
+use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
+
+class ServerConfigurationStructureService
+{
+    const REQUIRED_RELATIONS = ['allocation', 'allocations', 'pack', 'option'];
+
+    /**
+     * @var \Pterodactyl\Services\Servers\EnvironmentService
+     */
+    protected $environment;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * ServerConfigurationStructureService constructor.
+     *
+     * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository
+     * @param \Pterodactyl\Services\Servers\EnvironmentService            $environment
+     */
+    public function __construct(
+        ServerRepositoryInterface $repository,
+        EnvironmentService $environment
+    ) {
+        $this->repository = $repository;
+        $this->environment = $environment;
+    }
+
+    /**
+     * @param int|\Pterodactyl\Models\Server $server
+     * @return array
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function handle($server): array
+    {
+        if (! $server instanceof Server || array_diff(self::REQUIRED_RELATIONS, $server->getRelations())) {
+            $server = $this->repository->getDataForCreation(is_digit($server) ? $server : $server->id);
+        }
+
+        return [
+            'uuid' => $server->uuid,
+            'user' => $server->username,
+            'build' => [
+                'default' => [
+                    'ip' => $server->allocation->ip,
+                    'port' => $server->allocation->port,
+                ],
+                'ports' => $server->allocations->groupBy('ip')->map(function ($item) {
+                    return $item->pluck('port');
+                })->toArray(),
+                'env' => $this->environment->process($server),
+                'memory' => (int) $server->memory,
+                'swap' => (int) $server->swap,
+                'io' => (int) $server->io,
+                'cpu' => (int) $server->cpu,
+                'disk' => (int) $server->disk,
+                'image' => $server->image,
+            ],
+            'keys' => [],
+            'service' => [
+                'egg' => $server->egg->uuid,
+                'pack' => object_get($server, 'pack.uuid'),
+                'skip_scripts' => $server->skip_scripts,
+            ],
+            'rebuild' => false,
+            'suspended' => (int) $server->suspended,
+        ];
+    }
+}

app/Services/Servers/ServerCreationService.php

@@ -10,15 +10,14 @@
 namespace Pterodactyl\Services\Servers;
 
 use Ramsey\Uuid\Uuid;
-use Illuminate\Log\Writer;
-use Illuminate\Database\DatabaseManager;
 use GuzzleHttp\Exception\RequestException;
-use Pterodactyl\Exceptions\DisplayException;
+use Illuminate\Database\ConnectionInterface;
 use Pterodactyl\Services\Nodes\NodeCreationService;
 use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
 use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
+use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
 use Pterodactyl\Contracts\Repository\ServerVariableRepositoryInterface;
 use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
 
@@ -29,16 +28,21 @@ class ServerCreationService
      */
     protected $allocationRepository;
 
+    /**
+     * @var \Pterodactyl\Services\Servers\ServerConfigurationStructureService
+     */
+    protected $configurationStructureService;
+
+    /**
+     * @var \Illuminate\Database\ConnectionInterface
+     */
+    protected $connection;
+
     /**
      * @var \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface
      */
     protected $daemonServerRepository;
 
-    /**
-     * @var \Illuminate\Database\DatabaseManager
-     */
-    protected $database;
-
     /**
      * @var \Pterodactyl\Contracts\Repository\NodeRepositoryInterface
      */
@@ -69,47 +73,42 @@ class ServerCreationService
      */
     protected $validatorService;
 
-    /**
-     * @var \Illuminate\Log\Writer
-     */
-    protected $writer;
-
     /**
      * CreationService constructor.
      *
      * @param \Pterodactyl\Contracts\Repository\AllocationRepositoryInterface     $allocationRepository
+     * @param \Illuminate\Database\ConnectionInterface                            $connection
      * @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface  $daemonServerRepository
-     * @param \Illuminate\Database\DatabaseManager                                $database
      * @param \Pterodactyl\Contracts\Repository\NodeRepositoryInterface           $nodeRepository
+     * @param \Pterodactyl\Services\Servers\ServerConfigurationStructureService   $configurationStructureService
      * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface         $repository
      * @param \Pterodactyl\Contracts\Repository\ServerVariableRepositoryInterface $serverVariableRepository
      * @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface           $userRepository
      * @param \Pterodactyl\Services\Servers\UsernameGenerationService             $usernameService
      * @param \Pterodactyl\Services\Servers\VariableValidatorService              $validatorService
-     * @param \Illuminate\Log\Writer                                              $writer
      */
     public function __construct(
         AllocationRepositoryInterface $allocationRepository,
+        ConnectionInterface $connection,
         DaemonServerRepositoryInterface $daemonServerRepository,
-        DatabaseManager $database,
         NodeRepositoryInterface $nodeRepository,
+        ServerConfigurationStructureService $configurationStructureService,
         ServerRepositoryInterface $repository,
         ServerVariableRepositoryInterface $serverVariableRepository,
         UserRepositoryInterface $userRepository,
         UsernameGenerationService $usernameService,
-        VariableValidatorService $validatorService,
-        Writer $writer
+        VariableValidatorService $validatorService
     ) {
         $this->allocationRepository = $allocationRepository;
+        $this->configurationStructureService = $configurationStructureService;
+        $this->connection = $connection;
         $this->daemonServerRepository = $daemonServerRepository;
-        $this->database = $database;
         $this->nodeRepository = $nodeRepository;
         $this->repository = $repository;
         $this->serverVariableRepository = $serverVariableRepository;
         $this->userRepository = $userRepository;
         $this->usernameService = $usernameService;
         $this->validatorService = $validatorService;
-        $this->writer = $writer;
     }
 
     /**
@@ -125,10 +124,10 @@ class ServerCreationService
     public function create(array $data)
     {
         // @todo auto-deployment
-        $validator = $this->validatorService->isAdmin()->setFields($data['environment'])->validate($data['option_id']);
+        $validator = $this->validatorService->isAdmin()->setFields($data['environment'])->validate($data['egg_id']);
         $uniqueShort = str_random(8);
 
-        $this->database->beginTransaction();
+        $this->connection->beginTransaction();
 
         $server = $this->repository->create([
             'uuid' => Uuid::uuid4()->toString(),
@@ -146,8 +145,8 @@ class ServerCreationService
             'cpu' => $data['cpu'],
             'oom_disabled' => isset($data['oom_disabled']),
             'allocation_id' => $data['allocation_id'],
-            'service_id' => $data['service_id'],
-            'option_id' => $data['option_id'],
+            'nest_id' => $data['nest_id'],
+            'egg_id' => $data['egg_id'],
             'pack_id' => (! isset($data['pack_id']) || $data['pack_id'] == 0) ? null : $data['pack_id'],
             'startup' => $data['startup'],
             'daemonSecret' => str_random(NodeCreationService::DAEMON_SECRET_LENGTH),
@@ -175,19 +174,17 @@ class ServerCreationService
         }
 
         $this->serverVariableRepository->insert($records);
+        $structure = $this->configurationStructureService->handle($server->id);
 
         // Create the server on the daemon & commit it to the database.
         try {
-            $this->daemonServerRepository->setNode($server->node_id)->create($server->id);
-            $this->database->commit();
+            $this->daemonServerRepository->setNode($server->node_id)->create($structure, [
+                'start_on_completion' => (bool) array_get($data, 'start_on_completion', false),
+            ]);
+            $this->connection->commit();
         } catch (RequestException $exception) {
-            $response = $exception->getResponse();
-            $this->writer->warning($exception);
-            $this->database->rollBack();
-
-            throw new DisplayException(trans('admin/server.exceptions.daemon_exception', [
-                'code' => is_null($response) ? 'E_CONN_REFUSED' : $response->getStatusCode(),
-            ]));
+            $this->connection->rollBack();
+            throw new DaemonConnectionException($exception);
         }
 
         return $server;

app/Services/Servers/StartupModificationService.php

@@ -110,8 +110,8 @@ class StartupModificationService
         }
 
         if (
-            $server->service_id != array_get($data, 'service_id', $server->service_id) ||
-            $server->option_id != array_get($data, 'option_id', $server->option_id) ||
+            $server->nest_id != array_get($data, 'nest_id', $server->nest_id) ||
+            $server->egg_id != array_get($data, 'egg_id', $server->egg_id) ||
             $server->pack_id != array_get($data, 'pack_id', $server->pack_id)
         ) {
             $hasServiceChanges = true;
@@ -121,7 +121,7 @@ class StartupModificationService
         if (isset($data['environment'])) {
             $validator = $this->validatorService->isAdmin($this->admin)
                 ->setFields($data['environment'])
-                ->validate(array_get($data, 'option_id', $server->option_id));
+                ->validate(array_get($data, 'egg_id', $server->egg_id));
 
             foreach ($validator->getResults() as $result) {
                 $this->serverVariableRepository->withoutFresh()->updateOrCreate([
@@ -143,15 +143,15 @@ class StartupModificationService
             $server = $this->repository->update($server->id, [
                 'installed' => 0,
                 'startup' => array_get($data, 'startup', $server->startup),
-                'service_id' => array_get($data, 'service_id', $server->service_id),
-                'option_id' => array_get($data, 'option_id', $server->service_id),
-                'pack_id' => array_get($data, 'pack_id', $server->pack_id),
+                'nest_id' => array_get($data, 'nest_id', $server->nest_id),
+                'egg_id' => array_get($data, 'egg_id', $server->egg_id),
+                'pack_id' => array_get($data, 'pack_id', $server->pack_id) > 0 ? array_get($data, 'pack_id', $server->pack_id) : null,
                 'skip_scripts' => isset($data['skip_scripts']),
             ]);
 
             if (isset($hasServiceChanges)) {
                 $daemonData['service'] = array_merge(
-                    $this->repository->withColumns(['id', 'option_id', 'pack_id'])->getDaemonServiceData($server),
+                    $this->repository->withColumns(['id', 'egg_id', 'pack_id'])->getDaemonServiceData($server->id),
                     ['skip_scripts' => isset($data['skip_scripts'])]
                 );
             }

app/Services/Servers/VariableValidatorService.php

@@ -12,7 +12,7 @@ namespace Pterodactyl\Services\Servers;
 use Pterodactyl\Exceptions\DisplayValidationException;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 use Illuminate\Contracts\Validation\Factory as ValidationFactory;
-use Pterodactyl\Contracts\Repository\OptionVariableRepositoryInterface;
+use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
 use Pterodactyl\Contracts\Repository\ServerVariableRepositoryInterface;
 
 class VariableValidatorService
@@ -33,7 +33,7 @@ class VariableValidatorService
     protected $results = [];
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\OptionVariableRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface
      */
     protected $optionVariableRepository;
 
@@ -55,13 +55,13 @@ class VariableValidatorService
     /**
      * VariableValidatorService constructor.
      *
-     * @param \Pterodactyl\Contracts\Repository\OptionVariableRepositoryInterface $optionVariableRepository
+     * @param \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface    $optionVariableRepository
      * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface         $serverRepository
      * @param \Pterodactyl\Contracts\Repository\ServerVariableRepositoryInterface $serverVariableRepository
      * @param \Illuminate\Contracts\Validation\Factory                            $validator
      */
     public function __construct(
-        OptionVariableRepositoryInterface $optionVariableRepository,
+        EggVariableRepositoryInterface $optionVariableRepository,
         ServerRepositoryInterface $serverRepository,
         ServerVariableRepositoryInterface $serverVariableRepository,
         ValidationFactory $validator
@@ -106,7 +106,7 @@ class VariableValidatorService
      */
     public function validate($option)
     {
-        $variables = $this->optionVariableRepository->findWhere([['option_id', '=', $option]]);
+        $variables = $this->optionVariableRepository->findWhere([['egg_id', '=', $option]]);
         if (count($variables) === 0) {
             $this->results = [];
 

app/Services/Services/Options/InstallScriptUpdateService.php

@@ -1,63 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Services\Services\Options;
-
-use Pterodactyl\Models\ServiceOption;
-use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
-use Pterodactyl\Exceptions\Service\ServiceOption\InvalidCopyFromException;
-
-class InstallScriptUpdateService
-{
-    /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface
-     */
-    protected $repository;
-
-    /**
-     * InstallScriptUpdateService constructor.
-     *
-     * @param \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface $repository
-     */
-    public function __construct(ServiceOptionRepositoryInterface $repository)
-    {
-        $this->repository = $repository;
-    }
-
-    /**
-     * Modify the option install script for a given service option.
-     *
-     * @param int|\Pterodactyl\Models\ServiceOption $option
-     * @param array                                 $data
-     *
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     * @throws \Pterodactyl\Exceptions\Service\ServiceOption\InvalidCopyFromException
-     */
-    public function handle($option, array $data)
-    {
-        if (! $option instanceof ServiceOption) {
-            $option = $this->repository->find($option);
-        }
-
-        if (! is_null(array_get($data, 'copy_script_from'))) {
-            if (! $this->repository->isCopiableScript(array_get($data, 'copy_script_from'), $option->service_id)) {
-                throw new InvalidCopyFromException(trans('exceptions.service.options.invalid_copy_id'));
-            }
-        }
-
-        $this->repository->withoutFresh()->update($option->id, [
-            'script_install' => array_get($data, 'script_install'),
-            'script_is_privileged' => array_get($data, 'script_is_privileged'),
-            'script_entry' => array_get($data, 'script_entry'),
-            'script_container' => array_get($data, 'script_container'),
-            'copy_script_from' => array_get($data, 'copy_script_from'),
-        ]);
-    }
-}

app/Services/Services/Options/OptionCreationService.php

@@ -1,58 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Services\Services\Options;
-
-use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
-use Pterodactyl\Exceptions\Service\ServiceOption\NoParentConfigurationFoundException;
-
-class OptionCreationService
-{
-    /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface
-     */
-    protected $repository;
-
-    /**
-     * CreationService constructor.
-     *
-     * @param \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface $repository
-     */
-    public function __construct(ServiceOptionRepositoryInterface $repository)
-    {
-        $this->repository = $repository;
-    }
-
-    /**
-     * Create a new service option and assign it to the given service.
-     *
-     * @param array $data
-     * @return \Pterodactyl\Models\ServiceOption
-     *
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Service\ServiceOption\NoParentConfigurationFoundException
-     */
-    public function handle(array $data)
-    {
-        if (! is_null(array_get($data, 'config_from'))) {
-            $results = $this->repository->findCountWhere([
-                ['service_id', '=', array_get($data, 'service_id')],
-                ['id', '=', array_get($data, 'config_from')],
-            ]);
-
-            if ($results !== 1) {
-                throw new NoParentConfigurationFoundException(trans('exceptions.service.options.must_be_child'));
-            }
-        } else {
-            $data['config_from'] = null;
-        }
-
-        return $this->repository->create($data);
-    }
-}

app/Services/Services/Options/OptionDeletionService.php

@@ -1,69 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Services\Services\Options;
-
-use Webmozart\Assert\Assert;
-use Pterodactyl\Exceptions\Service\HasActiveServersException;
-use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
-use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
-use Pterodactyl\Exceptions\Service\ServiceOption\HasChildrenException;
-
-class OptionDeletionService
-{
-    /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface
-     */
-    protected $repository;
-
-    /**
-     * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
-     */
-    protected $serverRepository;
-
-    /**
-     * OptionDeletionService constructor.
-     *
-     * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface        $serverRepository
-     * @param \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface $repository
-     */
-    public function __construct(
-        ServerRepositoryInterface $serverRepository,
-        ServiceOptionRepositoryInterface $repository
-    ) {
-        $this->repository = $repository;
-        $this->serverRepository = $serverRepository;
-    }
-
-    /**
-     * Delete an option from the database if it has no active servers attached to it.
-     *
-     * @param int $option
-     * @return int
-     *
-     * @throws \Pterodactyl\Exceptions\Service\HasActiveServersException
-     * @throws \Pterodactyl\Exceptions\Service\ServiceOption\HasChildrenException
-     */
-    public function handle($option)
-    {
-        Assert::integerish($option, 'First argument passed to handle must be integer, received %s.');
-
-        $servers = $this->serverRepository->findCountWhere([['option_id', '=', $option]]);
-        if ($servers > 0) {
-            throw new HasActiveServersException(trans('exceptions.service.options.delete_has_servers'));
-        }
-
-        $children = $this->repository->findCountWhere([['config_from', '=', $option]]);
-        if ($children > 0) {
-            throw new HasChildrenException(trans('exceptions.service.options.has_children'));
-        }
-
-        return $this->repository->delete($option);
-    }
-}

app/Services/Services/Options/OptionUpdateService.php

@@ -1,62 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Services\Services\Options;
-
-use Pterodactyl\Models\ServiceOption;
-use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
-use Pterodactyl\Exceptions\Service\ServiceOption\NoParentConfigurationFoundException;
-
-class OptionUpdateService
-{
-    /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface
-     */
-    protected $repository;
-
-    /**
-     * OptionUpdateService constructor.
-     *
-     * @param \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface $repository
-     */
-    public function __construct(ServiceOptionRepositoryInterface $repository)
-    {
-        $this->repository = $repository;
-    }
-
-    /**
-     * Update a service option.
-     *
-     * @param int|\Pterodactyl\Models\ServiceOption $option
-     * @param array                                 $data
-     *
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     * @throws \Pterodactyl\Exceptions\Service\ServiceOption\NoParentConfigurationFoundException
-     */
-    public function handle($option, array $data)
-    {
-        if (! $option instanceof ServiceOption) {
-            $option = $this->repository->find($option);
-        }
-
-        if (! is_null(array_get($data, 'config_from'))) {
-            $results = $this->repository->findCountWhere([
-                ['service_id', '=', $option->service_id],
-                ['id', '=', array_get($data, 'config_from')],
-            ]);
-
-            if ($results !== 1) {
-                throw new NoParentConfigurationFoundException(trans('exceptions.service.options.must_be_child'));
-            }
-        }
-
-        $this->repository->withoutFresh()->update($option->id, $data);
-    }
-}

app/Services/Services/ServiceCreationService.php

@@ -1,64 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Services\Services;
-
-use Pterodactyl\Traits\Services\CreatesServiceIndex;
-use Illuminate\Contracts\Config\Repository as ConfigRepository;
-use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
-
-class ServiceCreationService
-{
-    use CreatesServiceIndex;
-
-    /**
-     * @var \Illuminate\Contracts\Config\Repository
-     */
-    protected $config;
-
-    /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface
-     */
-    protected $repository;
-
-    /**
-     * ServiceCreationService constructor.
-     *
-     * @param \Illuminate\Contracts\Config\Repository                      $config
-     * @param \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface $repository
-     */
-    public function __construct(
-        ConfigRepository $config,
-        ServiceRepositoryInterface $repository
-    ) {
-        $this->config = $config;
-        $this->repository = $repository;
-    }
-
-    /**
-     * Create a new service on the system.
-     *
-     * @param array $data
-     * @return \Pterodactyl\Models\Service
-     *
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     */
-    public function handle(array $data)
-    {
-        return $this->repository->create(array_merge([
-            'author' => $this->config->get('pterodactyl.service.author'),
-        ], [
-            'name' => array_get($data, 'name'),
-            'description' => array_get($data, 'description'),
-            'folder' => array_get($data, 'folder'),
-            'startup' => array_get($data, 'startup'),
-            'index_file' => $this->getIndexScript(),
-        ]));
-    }
-}

app/Services/Services/Variables/VariableCreationService.php

@@ -1,69 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Services\Services\Variables;
-
-use Pterodactyl\Models\ServiceOption;
-use Pterodactyl\Models\ServiceVariable;
-use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
-use Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface;
-use Pterodactyl\Exceptions\Service\ServiceVariable\ReservedVariableNameException;
-
-class VariableCreationService
-{
-    /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface
-     */
-    protected $serviceOptionRepository;
-
-    /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface
-     */
-    protected $serviceVariableRepository;
-
-    public function __construct(
-        ServiceOptionRepositoryInterface $serviceOptionRepository,
-        ServiceVariableRepositoryInterface $serviceVariableRepository
-    ) {
-        $this->serviceOptionRepository = $serviceOptionRepository;
-        $this->serviceVariableRepository = $serviceVariableRepository;
-    }
-
-    /**
-     * Create a new variable for a given service option.
-     *
-     * @param int|\Pterodactyl\Models\ServiceOption $option
-     * @param array                                 $data
-     * @return \Pterodactyl\Models\ServiceVariable
-     *
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Service\ServiceVariable\ReservedVariableNameException
-     */
-    public function handle($option, array $data)
-    {
-        if ($option instanceof ServiceOption) {
-            $option = $option->id;
-        }
-
-        if (in_array(strtoupper(array_get($data, 'env_variable')), explode(',', ServiceVariable::RESERVED_ENV_NAMES))) {
-            throw new ReservedVariableNameException(sprintf(
-                'Cannot use the protected name %s for this environment variable.',
-                array_get($data, 'env_variable')
-            ));
-        }
-
-        $options = array_get($data, 'options', []);
-
-        return $this->serviceVariableRepository->create(array_merge([
-            'option_id' => $option,
-            'user_viewable' => in_array('user_viewable', $options),
-            'user_editable' => in_array('user_editable', $options),
-        ], $data));
-    }
-}

app/Traits/Services/CreatesServiceIndex.php

@@ -1,56 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Traits\Services;
-
-trait CreatesServiceIndex
-{
-    /**
-     * Returns the default index.js file that is used for services on the daemon.
-     *
-     * @return string
-     */
-    public function getIndexScript()
-    {
-        return <<<'EOF'
-'use strict';
-
-/**
- * Pterodactyl - Daemon
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-const rfr = require('rfr');
-const _ = require('lodash');
-
-const Core = rfr('src/services/index.js');
-
-class Service extends Core {}
-
-module.exports = Service;
-EOF;
-    }
-}

app/Transformers/Admin/OptionTransformer.php

@@ -9,8 +9,8 @@
 
 namespace Pterodactyl\Transformers\Admin;
 
+use Pterodactyl\Models\Egg;
 use Illuminate\Http\Request;
-use Pterodactyl\Models\ServiceOption;
 use League\Fractal\TransformerAbstract;
 
 class OptionTransformer extends TransformerAbstract
@@ -53,7 +53,7 @@ class OptionTransformer extends TransformerAbstract
      *
      * @return array
      */
-    public function transform(ServiceOption $option)
+    public function transform(Egg $option)
     {
         return $option->toArray();
     }
@@ -63,7 +63,7 @@ class OptionTransformer extends TransformerAbstract
      *
      * @return \Leauge\Fractal\Resource\Collection
      */
-    public function includeService(ServiceOption $option)
+    public function includeService(Egg $option)
     {
         if ($this->request && ! $this->request->apiKeyHasPermission('service-view')) {
             return;
@@ -77,7 +77,7 @@ class OptionTransformer extends TransformerAbstract
      *
      * @return \Leauge\Fractal\Resource\Collection
      */
-    public function includePacks(ServiceOption $option)
+    public function includePacks(Egg $option)
     {
         if ($this->request && ! $this->request->apiKeyHasPermission('pack-list')) {
             return;
@@ -91,7 +91,7 @@ class OptionTransformer extends TransformerAbstract
      *
      * @return \Leauge\Fractal\Resource\Collection
      */
-    public function includeServers(ServiceOption $option)
+    public function includeServers(Egg $option)
     {
         if ($this->request && ! $this->request->apiKeyHasPermission('server-list')) {
             return;
@@ -105,7 +105,7 @@ class OptionTransformer extends TransformerAbstract
      *
      * @return \Leauge\Fractal\Resource\Collection
      */
-    public function includeVariables(ServiceOption $option)
+    public function includeVariables(Egg $option)
     {
         if ($this->request && ! $this->request->apiKeyHasPermission('option-view')) {
             return;