wip

Author: freekmurze

composer.json

@@ -32,7 +32,10 @@
     "autoload": {
         "psr-4": {
             "Spatie\\UptimeMonitor\\": "src"
-        }
+        },
+        "files": [
+            "src/Helpers/functions.php"
+        ]
     },
     "autoload-dev": {
         "psr-4": {

src/Commands/BaseCommand.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Spatie\UptimeMonitor\Commands;
+
+use Illuminate\Console\Command;
+use Spatie\UptimeMonitor\Helpers\ConsoleOutput;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+abstract class BaseCommand extends Command
+{
+    /**
+     * @param \Symfony\Component\Console\Input\InputInterface   $input
+     * @param \Symfony\Component\Console\Output\OutputInterface $output
+     *
+     * @return int
+     */
+    public function run(InputInterface $input, OutputInterface $output)
+    {
+        app(ConsoleOutput::class)->setOutput($this);
+
+        return parent::run($input, $output);
+    }
+}

src/Commands/CheckUptimeMonitors.php

@@ -2,11 +2,10 @@
 
 namespace Spatie\UptimeMonitor\Commands;
 
-use Illuminate\Console\Command;
 use Spatie\UptimeMonitor\Models\UptimeMonitor;
 use Spatie\UptimeMonitor\Services\PingMonitors\UptimeMonitorCollection;
 
-class CheckUptimeMonitors extends Command
+class CheckUptimeMonitors extends BaseCommand
 {
     /**
      * The name and signature of the console command.

src/Events/SiteUp.php

@@ -3,6 +3,7 @@
 namespace Spatie\UptimeMonitor\Events;
 
 use Illuminate\Contracts\Queue\ShouldQueue;
+use Spatie\UptimeMonitor\Models\UptimeMonitor;
 
 class SiteUp implements ShouldQueue
 {

src/Helpers/ConsoleOutput.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Spatie\UptimeMonitor\Helpers;
+
+class ConsoleOutput
+{
+    /** @var \Illuminate\Console\OutputStyle */
+    protected $output;
+
+    /**
+     * @param $output
+     */
+    public function setOutput($output)
+    {
+        $this->output = $output;
+    }
+
+    public function __call(string $method, array $arguments)
+    {
+        $consoleOutput = app(static::class);
+
+        if (! $consoleOutput->output) {
+            return;
+        }
+
+        $consoleOutput->output->$method($arguments[0]);
+    }
+}

src/Helpers/Format.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Spatie\UptimeMonitor\Helpers;
+
+class Format
+{
+    public static function emoji(bool $bool): string
+    {
+        if ($bool) {
+            return "\u{2705}";
+        }
+
+        return "\u{274C}";
+    }
+}

src/Helpers/functions.php

@@ -0,0 +1,10 @@
+<?php
+
+use Spatie\UptimeMonitor\Helpers\ConsoleOutput;
+
+
+
+function consoleOutput(): ConsoleOutput
+{
+    return app(ConsoleOutput::class);
+}

src/Notifications/EventHandler.php

@@ -22,11 +22,16 @@ public function __construct(Repository $config)
     public function subscribe(Dispatcher $events)
     {
         $events->listen($this->allUptimeMonitorEventClasses(), function ($event) {
-            $notifiable = $this->determineNotifiable();
 
             $notification = $this->determineNotification($event);
 
+            if (! $notification) {
+                return;
+            }
+
             if ($notification->isStillRelevant()) {
+                $notifiable = $this->determineNotifiable();
+
                 $notifiable->notify($notification);
             }
 
@@ -40,7 +45,7 @@ protected function determineNotifiable()
         return app($notifiableClass);
     }
 
-    protected function determineNotification($event): Notification
+    protected function determineNotification($event)
     {
         $eventName = class_basename($event);
 
@@ -55,11 +60,9 @@ protected function determineNotification($event): Notification
                 return $notificationName === $eventName;
             });
 
-        if (!$notificationClass) {
-            throw NotificationCouldNotBeSent::noNotifcationClassForEvent($event);
+        if ($notificationClass) {
+            return app($notificationClass)->setEvent($event);
         }
-
-        return app($notificationClass)->setEvent($event);
     }
 
     protected function allUptimeMonitorEventClasses(): array

src/UptimeMonitorCollection.php

@@ -2,7 +2,6 @@
 
 namespace Spatie\UptimeMonitor\Services\PingMonitors;
 
-use Spatie\UptimeMonitor\Models\PingMonitor;
 use Cache;
 use Generator;
 use GuzzleHttp\Client;
@@ -11,14 +10,15 @@
 use Illuminate\Support\Collection;
 use Log;
 use Psr\Http\Message\ResponseInterface;
+use Spatie\UptimeMonitor\Models\UptimeMonitor;
 
 class UptimeMonitorCollection extends Collection
 {
     public function check()
     {
         $this->resetItemKeys();
 
-        Log::info("Start checking for {$this->count()} monitors...");
+        consoleOutput()->info("Start checking for {$this->count()} monitors...");
 
         (new EachPromise($this->getPromises(), [
             'concurrency' => 100,
@@ -71,7 +71,7 @@ protected function resetItemKeys()
         $this->items = $this->values()->all();
     }
 
-    public function log($message, PingMonitor $pingMonitor)
+    public function log($message, UptimeMonitor $pingMonitor)
     {
         Log::info("$message (url: {$pingMonitor->url} id: {$pingMonitor->id})");
     }

src/UptimeMonitorServiceProvider.php

@@ -45,5 +45,7 @@ public function register()
             'command.uptime-monitor:delete',
             'command.uptime-monitor:list',
         ]);
+
+        $this->app->singleton(ConsoleOutput::class);
     }
 }