Merge branch 'master' into crawler

# Conflicts: # app/Checkers/Uptime.php # composer.lock
maelstrom-cms · Oct 12, 2019 · 26e709a · 26e709a
2 parents 435fa84 + 3ffae39
commit 26e709a
Show file tree

Hide file tree

Showing 12 changed files with 604 additions and 261 deletions.
diff --git a/.env.example b/.env.example
@@ -20,8 +20,7 @@ MAIL_DRIVER=mailgun
 MAIL_FROM_ADDRESS=[email protected]
 MAIL_FROM_NAME="${APP_NAME}"
 
+ENFORCE_DOMAIN=true
 HORIZON_ENABLED=false
 DEBUGBAR_ENABLED=false
-ENFORCE_DOMAIN=true
-
-LOGIN_EMAIL=[email protected]
+REGISTRATIONS_ENABLED=true
diff --git a/app/Checkers/Uptime.php b/app/Checkers/Uptime.php
@@ -23,13 +23,15 @@ public function run()
     {
         $this->fetch();
         $this->notify();
+        $this->cache();
     }
 
     private function fetch()
     {
         $client = new Client();
 
         $response_time = 3001;
+<<<<<<< HEAD
 
         $response = $client->request('GET', $this->website->url, [
             RequestOptions::ON_STATS => function ($stats) use (&$response_time) {
@@ -43,12 +45,33 @@ private function fetch()
         ]);
 
         $keywordFound = Str::contains($response->getBody(), $this->website->uptime_keyword);
+=======
+        $keywordFound = false;
+
+       try {
+           $response = $client->request('GET', $this->website->url, [
+               'on_stats' => function ($stats) use (&$response_time) {
+                   $response_time = $stats->getTransferTime();
+               },
+               'http_errors' => false,
+               'verify' => false,
+               'allow_redirects' => true,
+               'headers' => [
+                   'User-Agent' => 'Mozilla/5.0+(compatible; UptimeRobot/2.0; http://www.uptimerobot.com/; Odin)'
+               ],
+           ]);
+
+           $keywordFound = Str::contains($response->getBody(), $this->website->uptime_keyword);
+>>>>>>> master
 
         if (!$keywordFound && $response->getStatusCode() == '200') {
-            $reason = sprintf('Keyword: %s not found (%d)', $this->website->uptime_keyword, 200);
-        } else {
-            $reason = sprintf('%s (%d)', $response->getReasonPhrase(), $response->getStatusCode());
-        }
+               $reason = sprintf('Keyword: %s not found (%d)', $this->website->uptime_keyword, 200);
+           } else {
+               $reason = sprintf('%s (%d)', $response->getReasonPhrase(), $response->getStatusCode());
+           }
+       } catch (\Exception $exception) {
+           $reason = $exception->getMessage();
+       }
 
         $scan = new UptimeScan([
             'response_status' => $reason,
@@ -80,4 +103,9 @@ private function notify()
             );
         }
     }
+
+    private function cache()
+    {
+        $this->website->generateUptimeReport(true);
+    }
 }
diff --git a/app/HasUptime.php b/app/HasUptime.php
@@ -8,7 +8,34 @@ trait HasUptime
 {
     public function uptimes()
     {
-        return $this->hasMany(UptimeScan::class)->orderBy('created_at', 'desc');
+        return $this->hasMany(UptimeScan::class)
+            ->where('created_at', '<', now()->addDays(31))
+            ->orderBy('created_at', 'desc');
+    }
+
+    public function generateUptimeReport($refreshCache = false)
+    {
+        if ($refreshCache) {
+            cache()->forget($this->cache_key);
+            $this->load(['uptimes']);
+        }
+
+        return cache()->rememberForever($this->cache_key, function () {
+            return [
+                'uptime' => $this->uptime_summary,
+                'response_time' => $this->response_time,
+                'response_times' => $this->response_times,
+                'online' => $this->current_state,
+                'online_time' => $this->uptime,
+                'last_incident' => $this->last_incident,
+                'events' => $this->recent_events,
+            ];
+        });
+    }
+
+    public function getCacheKeyAttribute()
+    {
+        return 'uptime_' . $this->getKey();
     }
 
     public function getLastIncidentAttribute()

diff --git a/app/Http/Controllers/UptimeReportController.php b/app/Http/Controllers/UptimeReportController.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use Exception;
 use App\Website;
 use App\Jobs\UptimeCheck;
 use Illuminate\Http\Request;
@@ -14,24 +15,15 @@ class UptimeReportController extends Controller
      * @param Request $request
      * @param Website $website
      * @return array
+     * @throws Exception
      */
     public function __invoke(Request $request, Website $website)
     {
         if ($request->has('refresh')) {
             UptimeCheck::dispatchNow($website);
         }
 
-        $website->load(['uptimes']);
-
-        $response = [
-            'uptime' => $website->uptime_summary,
-            'response_time' => $website->response_time,
-            'response_times' => $website->response_times,
-            'online' => $website->current_state,
-            'online_time' => $website->uptime,
-            'last_incident' => $website->last_incident,
-            'events' => $website->recent_events,
-        ];
+        $response = $website->generateUptimeReport();
 
         return response($response);
     }

diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
@@ -2,6 +2,7 @@
 
 namespace App\Providers;
 
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
 
@@ -52,8 +53,14 @@ public function map()
     protected function mapWebRoutes()
     {
         Route::middleware('web')
-             ->namespace($this->namespace)
-             ->group(base_path('routes/web.php'));
+            ->namespace($this->namespace)
+            ->group(function () {
+                Auth::routes([
+                    'register' => config('auth.registrations_enabled'),
+                ]);
+
+                include_once base_path('routes/web.php');
+            });
     }
 
     /**

diff --git a/composer.json b/composer.json
@@ -10,6 +10,7 @@
     "require": {
         "php": "^7.1.3",
         "doctrine/annotations": "^1.7",
+        "doctrine/dbal": "^2.9",
         "embed/embed": "^3.4",
         "fideloper/proxy": "^4.0",
         "guzzlehttp/guzzle": "^6.3",
@@ -40,6 +41,12 @@
         "preferred-install": "dist",
         "sort-packages": true
     },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/OwenMelbz/DNSParser"
+        }
+    ],
     "extra": {
         "laravel": {
             "dont-discover": []