Deprecate old way of using repositories for daemon things

DaneEveritt · DaneEveritt · commit 161e0f616581 · 2019-09-05T20:33:27.000-07:00
diff --git a/app/Console/Commands/Server/BulkReinstallActionCommand.php b/app/Console/Commands/Server/BulkReinstallActionCommand.php
@@ -12,7 +12,7 @@
 use Webmozart\Assert\Assert;
 use Illuminate\Console\Command;
 use GuzzleHttp\Exception\RequestException;
-use Pterodactyl\Repositories\Wings\WingsServerRepository;
+use Pterodactyl\Repositories\Wings\DaemonServerRepository;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 use Pterodactyl\Services\Servers\ServerConfigurationStructureService;
 
@@ -34,7 +34,7 @@ class BulkReinstallActionCommand extends Command
     protected $description = 'Reinstall a single server, all servers on a node, or all servers on the panel.';
 
     /**
-     * @var \Pterodactyl\Repositories\Wings\WingsServerRepository
+     * @var \Pterodactyl\Repositories\Wings\DaemonServerRepository
      */
     protected $repository;
 
@@ -48,12 +48,12 @@ class BulkReinstallActionCommand extends Command
     /**
      * BulkReinstallActionCommand constructor.
      *
-     * @param \Pterodactyl\Repositories\Wings\WingsServerRepository             $daemonRepository
+     * @param \Pterodactyl\Repositories\Wings\DaemonServerRepository            $daemonRepository
      * @param \Pterodactyl\Services\Servers\ServerConfigurationStructureService $configurationStructureService
      * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface       $repository
      */
     public function __construct(
-        WingsServerRepository $daemonRepository,
+        DaemonServerRepository $daemonRepository,
         ServerConfigurationStructureService $configurationStructureService,
         ServerRepositoryInterface $repository
     ) {
diff --git a/app/Console/Commands/Server/RebuildServerCommand.php b/app/Console/Commands/Server/RebuildServerCommand.php
@@ -12,7 +12,7 @@
 use Webmozart\Assert\Assert;
 use Illuminate\Console\Command;
 use GuzzleHttp\Exception\RequestException;
-use Pterodactyl\Repositories\Wings\WingsServerRepository;
+use Pterodactyl\Repositories\Wings\DaemonServerRepository;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 use Pterodactyl\Services\Servers\ServerConfigurationStructureService;
 
@@ -24,7 +24,7 @@ class RebuildServerCommand extends Command
     protected $configurationStructureService;
 
     /**
-     * @var \Pterodactyl\Repositories\Wings\WingsServerRepository
+     * @var \Pterodactyl\Repositories\Wings\DaemonServerRepository
      */
     protected $daemonRepository;
 
@@ -48,12 +48,12 @@ class RebuildServerCommand extends Command
     /**
      * RebuildServerCommand constructor.
      *
-     * @param \Pterodactyl\Repositories\Wings\WingsServerRepository             $daemonRepository
+     * @param \Pterodactyl\Repositories\Wings\DaemonServerRepository            $daemonRepository
      * @param \Pterodactyl\Services\Servers\ServerConfigurationStructureService $configurationStructureService
      * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface       $repository
      */
     public function __construct(
-        WingsServerRepository $daemonRepository,
+        DaemonServerRepository $daemonRepository,
         ServerConfigurationStructureService $configurationStructureService,
         ServerRepositoryInterface $repository
     ) {
diff --git a/app/Contracts/Repository/Daemon/BaseRepositoryInterface.php b/app/Contracts/Repository/Daemon/BaseRepositoryInterface.php
@@ -6,6 +6,9 @@
 use Pterodactyl\Models\Node;
 use Pterodactyl\Models\Server;
 
+/**
+ * @deprecated
+ */
 interface BaseRepositoryInterface
 {
     /**
diff --git a/app/Contracts/Repository/Daemon/CommandRepositoryInterface.php b/app/Contracts/Repository/Daemon/CommandRepositoryInterface.php
@@ -4,6 +4,9 @@
 
 use Psr\Http\Message\ResponseInterface;
 
+/**
+ * @deprecated
+ */
 interface CommandRepositoryInterface extends BaseRepositoryInterface
 {
     /**
diff --git a/app/Contracts/Repository/Daemon/ConfigurationRepositoryInterface.php b/app/Contracts/Repository/Daemon/ConfigurationRepositoryInterface.php
@@ -4,6 +4,9 @@
 
 use Psr\Http\Message\ResponseInterface;
 
+/**
+ * @deprecated
+ */
 interface ConfigurationRepositoryInterface extends BaseRepositoryInterface
 {
     /**
diff --git a/app/Contracts/Repository/Daemon/FileRepositoryInterface.php b/app/Contracts/Repository/Daemon/FileRepositoryInterface.php
@@ -5,6 +5,9 @@
 use stdClass;
 use Psr\Http\Message\ResponseInterface;
 
+/**
+ * @deprecated
+ */
 interface FileRepositoryInterface extends BaseRepositoryInterface
 {
     /**
diff --git a/app/Contracts/Repository/Daemon/PowerRepositoryInterface.php b/app/Contracts/Repository/Daemon/PowerRepositoryInterface.php
@@ -4,6 +4,9 @@
 
 use Psr\Http\Message\ResponseInterface;
 
+/**
+ * @deprecated
+ */
 interface PowerRepositoryInterface extends BaseRepositoryInterface
 {
     const SIGNAL_START = 'start';
diff --git a/app/Contracts/Repository/Daemon/ServerRepositoryInterface.php b/app/Contracts/Repository/Daemon/ServerRepositoryInterface.php
@@ -4,6 +4,9 @@
 
 use Psr\Http\Message\ResponseInterface;
 
+/**
+ * @deprecated
+ */
 interface ServerRepositoryInterface extends BaseRepositoryInterface
 {
     /**
diff --git a/app/Http/Controllers/Api/Client/Servers/ResourceUtilizationController.php b/app/Http/Controllers/Api/Client/Servers/ResourceUtilizationController.php
@@ -3,24 +3,24 @@
 namespace Pterodactyl\Http\Controllers\Api\Client\Servers;
 
 use Pterodactyl\Models\Server;
-use Pterodactyl\Repositories\Wings\WingsServerRepository;
 use Pterodactyl\Transformers\Api\Client\StatsTransformer;
+use Pterodactyl\Repositories\Wings\DaemonServerRepository;
 use Pterodactyl\Http\Controllers\Api\Client\ClientApiController;
 use Pterodactyl\Http\Requests\Api\Client\Servers\GetServerRequest;
 
 class ResourceUtilizationController extends ClientApiController
 {
     /**
-     * @var \Pterodactyl\Repositories\Wings\WingsServerRepository
+     * @var \Pterodactyl\Repositories\Wings\DaemonServerRepository
      */
     private $repository;
 
     /**
      * ResourceUtilizationController constructor.
      *
-     * @param \Pterodactyl\Repositories\Wings\WingsServerRepository $repository
+     * @param \Pterodactyl\Repositories\Wings\DaemonServerRepository $repository
      */
-    public function __construct(WingsServerRepository $repository)
+    public function __construct(DaemonServerRepository $repository)
     {
         parent::__construct();
 
diff --git a/app/Providers/RepositoryServiceProvider.php b/app/Providers/RepositoryServiceProvider.php
@@ -3,28 +3,27 @@
 namespace Pterodactyl\Providers;
 
 use Illuminate\Support\ServiceProvider;
-use Pterodactyl\Repositories\Wings\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;
 use Pterodactyl\Repositories\Eloquent\UserRepository;
-use Pterodactyl\Repositories\Daemon\CommandRepository;
 use Pterodactyl\Repositories\Eloquent\ApiKeyRepository;
 use Pterodactyl\Repositories\Eloquent\ServerRepository;
 use Pterodactyl\Repositories\Eloquent\SessionRepository;
 use Pterodactyl\Repositories\Eloquent\SubuserRepository;
+use Pterodactyl\Repositories\Wings\DaemonFileRepository;
 use Pterodactyl\Repositories\Eloquent\DatabaseRepository;
 use Pterodactyl\Repositories\Eloquent\LocationRepository;
 use Pterodactyl\Repositories\Eloquent\ScheduleRepository;
 use Pterodactyl\Repositories\Eloquent\SettingsRepository;
+use Pterodactyl\Repositories\Wings\DaemonPowerRepository;
 use Pterodactyl\Repositories\Eloquent\DaemonKeyRepository;
 use Pterodactyl\Repositories\Eloquent\AllocationRepository;
 use Pterodactyl\Repositories\Eloquent\PermissionRepository;
+use Pterodactyl\Repositories\Wings\DaemonCommandRepository;
 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;
@@ -41,6 +40,7 @@
 use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
 use Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface;
 use Pterodactyl\Contracts\Repository\SettingsRepositoryInterface;
+use Pterodactyl\Repositories\Wings\DaemonConfigurationRepository;
 use Pterodactyl\Contracts\Repository\DaemonKeyRepositoryInterface;
 use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
 use Pterodactyl\Contracts\Repository\PermissionRepositoryInterface;
@@ -51,7 +51,7 @@
 use Pterodactyl\Contracts\Repository\Daemon\CommandRepositoryInterface;
 use Pterodactyl\Contracts\Repository\ServerVariableRepositoryInterface;
 use Pterodactyl\Contracts\Repository\Daemon\ConfigurationRepositoryInterface;
-use Pterodactyl\Repositories\Wings\WingsServerRepository as DaemonServerRepository;
+use Pterodactyl\Repositories\Wings\DaemonServerRepository as DaemonServerRepository;
 use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
 
 class RepositoryServiceProvider extends ServiceProvider
@@ -84,10 +84,10 @@ public function register()
         $this->app->bind(UserRepositoryInterface::class, UserRepository::class);
 
         // Daemon Repositories
-        $this->app->bind(ConfigurationRepositoryInterface::class, ConfigurationRepository::class);
-        $this->app->bind(CommandRepositoryInterface::class, CommandRepository::class);
+        $this->app->bind(ConfigurationRepositoryInterface::class, DaemonConfigurationRepository::class);
+        $this->app->bind(CommandRepositoryInterface::class, DaemonCommandRepository::class);
         $this->app->bind(DaemonServerRepositoryInterface::class, DaemonServerRepository::class);
-        $this->app->bind(FileRepositoryInterface::class, FileRepository::class);
-        $this->app->bind(PowerRepositoryInterface::class, PowerRepository::class);
+        $this->app->bind(FileRepositoryInterface::class, DaemonFileRepository::class);
+        $this->app->bind(PowerRepositoryInterface::class, DaemonPowerRepository::class);
     }
 }
diff --git a/app/Repositories/Wings/BaseWingsRepository.php b/app/Repositories/Wings/BaseWingsRepository.php
diff --git a/app/Repositories/Wings/DaemonCommandRepository.php b/app/Repositories/Wings/DaemonCommandRepository.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Pterodactyl\Repositories\Wings;
+
+class DaemonCommandRepository extends DaemonRepository
+{
+}
diff --git a/app/Repositories/Wings/DaemonConfigurationRepository.php b/app/Repositories/Wings/DaemonConfigurationRepository.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Pterodactyl\Repositories\Wings;
+
+class DaemonConfigurationRepository extends DaemonRepository
+{
+}
diff --git a/app/Repositories/Wings/DaemonFileRepository.php b/app/Repositories/Wings/DaemonFileRepository.php
@@ -4,11 +4,12 @@
 
 use stdClass;
 use Exception;
+use Webmozart\Assert\Assert;
+use Pterodactyl\Models\Server;
 use Psr\Http\Message\ResponseInterface;
 use Pterodactyl\Exceptions\Http\Server\FileSizeTooLargeException;
-use Pterodactyl\Contracts\Repository\Daemon\FileRepositoryInterface;
 
-class FileRepository extends BaseWingsRepository implements FileRepositoryInterface
+class DaemonFileRepository extends DaemonRepository
 {
     /**
      * Return stat information for a given file.
@@ -36,8 +37,10 @@ public function getFileStat(string $path): stdClass
      */
     public function getContent(string $path, int $notLargerThan = null): string
     {
+        Assert::isInstanceOf(Server::class, $this->server);
+
         $response = $this->getHttpClient()->get(
-            sprintf('/api/servers/%s/files/contents', $this->getServer()->uuid),
+            sprintf('/api/servers/%s/files/contents', $this->server->uuid),
             [
                 'query' => ['file' => $path],
             ]
@@ -66,8 +69,10 @@ public function getContent(string $path, int $notLargerThan = null): string
      */
     public function putContent(string $path, string $content): ResponseInterface
     {
+        Assert::isInstanceOf(Server::class, $this->server);
+
         return $this->getHttpClient()->post(
-            sprintf('/api/servers/%s/files/write', $this->getServer()->uuid),
+            sprintf('/api/servers/%s/files/write', $this->server->uuid),
             [
                 'query' => ['file' => $path],
                 'body' => $content,
@@ -85,8 +90,10 @@ public function putContent(string $path, string $content): ResponseInterface
      */
     public function getDirectory(string $path): array
     {
+        Assert::isInstanceOf(Server::class, $this->server);
+
         $response = $this->getHttpClient()->get(
-            sprintf('/api/servers/%s/files/list-directory', $this->getServer()->uuid),
+            sprintf('/api/servers/%s/files/list-directory', $this->server->uuid),
             [
                 'query' => ['directory' => $path],
             ]
@@ -104,8 +111,10 @@ public function getDirectory(string $path): array
      */
     public function createDirectory(string $name, string $path): ResponseInterface
     {
+        Assert::isInstanceOf(Server::class, $this->server);
+
         return $this->getHttpClient()->post(
-            sprintf('/api/servers/%s/files/create-directory', $this->getServer()->uuid),
+            sprintf('/api/servers/%s/files/create-directory', $this->server->uuid),
             [
                 'json' => [
                     'name' => $name,
@@ -124,8 +133,10 @@ public function createDirectory(string $name, string $path): ResponseInterface
      */
     public function renameFile(string $from, string $to): ResponseInterface
     {
+        Assert::isInstanceOf(Server::class, $this->server);
+
         return $this->getHttpClient()->put(
-            sprintf('/api/servers/%s/files/rename', $this->getServer()->uuid),
+            sprintf('/api/servers/%s/files/rename', $this->server->uuid),
             [
                 'json' => [
                     'rename_from' => $from,
@@ -143,8 +154,10 @@ public function renameFile(string $from, string $to): ResponseInterface
      */
     public function copyFile(string $location): ResponseInterface
     {
+        Assert::isInstanceOf(Server::class, $this->server);
+
         return $this->getHttpClient()->post(
-            sprintf('/api/servers/%s/files/copy', $this->getServer()->uuid),
+            sprintf('/api/servers/%s/files/copy', $this->server->uuid),
             [
                 'json' => [
                     'location' => $location,
@@ -161,8 +174,10 @@ public function copyFile(string $location): ResponseInterface
      */
     public function deleteFile(string $location): ResponseInterface
     {
+        Assert::isInstanceOf(Server::class, $this->server);
+
         return $this->getHttpClient()->post(
-            sprintf('/api/servers/%s/files/delete', $this->getServer()->uuid),
+            sprintf('/api/servers/%s/files/delete', $this->server->uuid),
             [
                 'json' => [
                     'location' => $location,
diff --git a/app/Repositories/Wings/DaemonPowerRepository.php b/app/Repositories/Wings/DaemonPowerRepository.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Pterodactyl\Repositories\Wings;
+
+class DaemonPowerRepository extends DaemonRepository
+{
+}
diff --git a/app/Repositories/Wings/DaemonRepository.php b/app/Repositories/Wings/DaemonRepository.php
diff --git a/app/Repositories/Wings/DaemonServerRepository.php b/app/Repositories/Wings/DaemonServerRepository.php

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,9 @@`
`6`	`6`	`use Pterodactyl\Models\Node;`
`7`	`7`	`use Pterodactyl\Models\Server;`
`8`	`8`
	`9`	`+/**`
	`10`	`+ * @deprecated`
	`11`	`+ */`
`9`	`12`	`interface BaseRepositoryInterface`
`10`	`13`	`{`
`11`	`14`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,9 @@`
`4`	`4`
`5`	`5`	`use Psr\Http\Message\ResponseInterface;`
`6`	`6`
	`7`	`+/**`
	`8`	`+ * @deprecated`
	`9`	`+ */`
`7`	`10`	`interface CommandRepositoryInterface extends BaseRepositoryInterface`
`8`	`11`	`{`
`9`	`12`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,9 @@`
`5`	`5`	`use stdClass;`
`6`	`6`	`use Psr\Http\Message\ResponseInterface;`
`7`	`7`
	`8`	`+/**`
	`9`	`+ * @deprecated`
	`10`	`+ */`
`8`	`11`	`interface FileRepositoryInterface extends BaseRepositoryInterface`
`9`	`12`	`{`
`10`	`13`	`/**`