Add in query caching on server view

.env.example

@@ -13,7 +13,7 @@ DB_DATABASE=homestead
 DB_USERNAME=homestead
 DB_PASSWORD=secret
 
-CACHE_DRIVER=file
+CACHE_DRIVER=memcached
 SESSION_DRIVER=database
 
 MAIL_DRIVER=smtp

CHANGELOG.md

@@ -6,6 +6,11 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 ## v0.6.0-pre.3 (Courageous Carniadactylus)
 ### Fixed
 * `[pre.2]` — Fixes bug where servers could not be manually deployed to nodes due to a broken SQL call.
+* `[pre.2]` — Fixes inability to edit a server due to owner_id issues.
+
+### Changed
+* `[pre.2]` — File Manager now displays relevant information on all screen sizes, and includes better button clicking mechanics for dropdown menu.
+* Reduced the number of database queries being executed when viewing a specific server. This is done by caching the query for up to 60 minutes in memcached.
 
 ## v0.6.0-pre.2 (Courageous Carniadactylus)
 ### Fixed

app/Console/Commands/UpdateEnvironment.php

@@ -134,6 +134,10 @@ class UpdateEnvironment extends Command
             $variables['APP_TIMEZONE'] = $this->option('timezone');
         }
 
+        $variables['APP_THEME'] = 'pterodactyl';
+        $variables['CACHE_DRIVER'] = 'memcached';
+        $variables['SESSION_DRIVER'] = 'database';
+
         $bar = $this->output->createProgressBar(count($variables));
 
         $this->line('Writing new environment configuration to file.');

app/Events/Server/Saved.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * 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.
+ */
+
+namespace Pterodactyl\Events\Server;
+
+use Pterodactyl\Models\Server;
+use Illuminate\Queue\SerializesModels;
+
+class Saved
+{
+    use SerializesModels;
+
+    public $server;
+
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct(Server $server)
+    {
+        $this->server = $server;
+    }
+}

app/Events/Server/Saving.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * 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.
+ */
+
+namespace Pterodactyl\Events\Server;
+
+use Pterodactyl\Models\Server;
+use Illuminate\Queue\SerializesModels;
+
+class Saving
+{
+    use SerializesModels;
+
+    public $server;
+
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct(Server $server)
+    {
+        $this->server = $server;
+    }
+}

app/Events/Server/Updated.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * 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.
+ */
+
+namespace Pterodactyl\Events\Server;
+
+use Pterodactyl\Models\Server;
+use Illuminate\Queue\SerializesModels;
+
+class Updated
+{
+    use SerializesModels;
+
+    public $server;
+
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct(Server $server)
+    {
+        $this->server = $server;
+    }
+}

app/Events/Server/Updating.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * 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.
+ */
+
+namespace Pterodactyl\Events\Server;
+
+use Pterodactyl\Models\Server;
+use Illuminate\Queue\SerializesModels;
+
+class Updating
+{
+    use SerializesModels;
+
+    public $server;
+
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct(Server $server)
+    {
+        $this->server = $server;
+    }
+}

app/Http/Controllers/Base/IndexController.php

@@ -47,7 +47,7 @@ class IndexController extends Controller
     public function getIndex(Request $request)
     {
         return view('base.index', [
-            'servers' => $request->user()->serverAccessCollection(10)->load('node', 'allocation'),
+            'servers' => $request->user()->serverAccessCollection(10),
         ]);
     }
 

app/Models/Server.php

@@ -25,6 +25,7 @@
 namespace Pterodactyl\Models;
 
 use Auth;
+use Cache;
 use Javascript;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Notifications\Notifiable;
@@ -113,16 +114,19 @@ class Server extends Model
      */
     public static function byUuid($uuid)
     {
-        $query = self::with('service', 'node')->where(function ($q) use ($uuid) {
+        // Results are cached because we call this functions a few times on page load.
-            $q->where('uuidShort', $uuid)->orWhere('uuid', $uuid);
+        $result = Cache::remember('Server.byUuid.' . $uuid, 60, function () use ($uuid) {
+            $query = self::with('service', 'node')->where(function ($q) use ($uuid) {
+                $q->where('uuidShort', $uuid)->orWhere('uuid', $uuid);
+            });
+
+            if (! Auth::user()->isRootAdmin()) {
+                $query->whereIn('id', Auth::user()->serverAccessArray());
+            }
+
+            return $query->first();
         });
 
-        if (! Auth::user()->isRootAdmin()) {
-            $query->whereIn('id', Auth::user()->serverAccessArray());
-        }
-
-        $result = $query->first();
-
         if (! is_null($result)) {
             $result->daemonSecret = Auth::user()->daemonToken($result);
         }

app/Models/User.php

@@ -186,9 +186,9 @@ class User extends Model implements AuthenticatableContract, AuthorizableContrac
      *
      * @return Collection
      */
-    public function serverAccessCollection($paginate = null)
+    public function serverAccessCollection($paginate = null, $load = ['service', 'node', 'allocation'])
     {
-        $query = Server::with('service', 'node');
+        $query = Server::with($load);
         if (! $this->isRootAdmin()) {
             $query->whereIn('id', $this->serverAccessArray());
         }

app/Observers/ServerObserver.php

@@ -24,6 +24,7 @@
 
 namespace Pterodactyl\Observers;
 
+use Cache;
 use Carbon;
 use Pterodactyl\Events;
 use Pterodactyl\Models\Server;
@@ -97,4 +98,52 @@ class ServerObserver
             ->onQueue(env('QUEUE_STANDARD', 'standard'))
         );
     }
+
+    /**
+     * Listen to the Server saving event.
+     *
+     * @param  Server $server [description]
+     * @return [type]         [description]
+     */
+    public function saving(Server $server)
+    {
+        event(new Events\Server\Saving($server));
+    }
+
+    /**
+     * Listen to the Server saved event.
+     *
+     * @param  Server $server [description]
+     * @return [type]         [description]
+     */
+    public function saved(Server $server)
+    {
+        event(new Events\Server\Saved($server));
+    }
+
+    /**
+     * Listen to the Server saving event.
+     *
+     * @param  Server $server [description]
+     * @return [type]         [description]
+     */
+    public function updating(Server $server)
+    {
+        event(new Events\Server\Updating($server));
+    }
+
+    /**
+     * Listen to the Server saved event.
+     *
+     * @param  Server $server [description]
+     * @return [type]         [description]
+     */
+    public function updated(Server $server)
+    {
+        // Clear Caches
+        Cache::forget('Server.byUuid.' . $server->uuid);
+        Cache::forget('Server.byUuid.' . $server->uuidShort);
+
+        event(new Events\Server\Updated($server));
+    }
 }

config/cache.php

@@ -13,7 +13,7 @@ return [
     |
     */
 
-    'default' => env('CACHE_DRIVER', 'file'),
+    'default' => env('CACHE_DRIVER', 'memcached'),
 
     /*
     |--------------------------------------------------------------------------
@@ -51,7 +51,9 @@ return [
             'driver'  => 'memcached',
             'servers' => [
                 [
-                    'host' => '127.0.0.1', 'port' => 11211, 'weight' => 100,
+                    'host' => env('MEMCACHE_DRIVER_HOST', '127.0.0.1'),
+                    'port' => env('MEMCACHE_DRIVER_PORT', 11211),
+                    'weight' => 100,
                 ],
             ],
         ],

config/debugbar.php

@@ -92,7 +92,7 @@ return [
         'views'           => true,  // Views with their data
         'route'           => true,  // Current route information
         'laravel'         => false, // Laravel version and environment
-        'events'          => false, // All events fired
+        'events'          => true, // All events fired
         'default_request' => false, // Regular or special Symfony request logger
         'symfony_request' => true,  // Only one can be enabled..
         'mail'            => true,  // Catch mail messages
@@ -119,11 +119,11 @@ return [
         ],
         'db' => [
             'with_params'       => true,   // Render SQL with the parameters substituted
-            'timeline'          => false,  // Add the queries to the timeline
+            'timeline'          => true,  // Add the queries to the timeline
-            'backtrace'         => false,  // EXPERIMENTAL: Use a backtrace to find the origin of the query in your files.
+            'backtrace'         => true,  // EXPERIMENTAL: Use a backtrace to find the origin of the query in your files.
             'explain' => [            // EXPERIMENTAL: Show EXPLAIN output on queries
                 'enabled' => false,
-                'types' => ['SELECT'], // array('SELECT', 'INSERT', 'UPDATE', 'DELETE'); for MySQL 5.6.3+
+                'types' => ['SELECT', 'INSERT', 'UPDATE', 'DELETE'], // array('SELECT', 'INSERT', 'UPDATE', 'DELETE'); for MySQL 5.6.3+
             ],
             'hints'             => true,    // Show hints for common mistakes
         ],

resources/themes/pterodactyl/layouts/master.blade.php

@@ -219,7 +219,7 @@
                 <div class="tab-content">
                     <div class="tab-pane active" id="control-sidebar-servers-tab">
                         <ul class="control-sidebar-menu">
-                            @foreach (Auth::user()->serverAccessCollection() as $s)
+                            @foreach (Auth::user()->serverAccessCollection(null, []) as $s)
                                 <li>
                                     <a
                                         @if(isset($server) && isset($node))