Add cooldown to statistics collector

Author: mpociot

app/Connections/ConnectionManager.php

@@ -56,6 +56,7 @@ public function limitConnectionLength(ControlConnection $connection, int $maximu
             if ($cooldownPeriod > 0 && !empty($connection->authToken)) {
                 $cooldownEndsAt = time() + ($cooldownPeriod * 60);
                 app(\Expose\Server\Contracts\UserRepository::class)->setCooldownForToken($connection->authToken, $cooldownEndsAt);
+                $this->statisticsCollector->cooldownTriggered();
             }
         });
     }

app/Contracts/StatisticsCollector.php

@@ -10,6 +10,8 @@ public function portShared($authToken = null);
 
     public function incomingRequest();
 
+    public function cooldownTriggered();
+
     public function flush();
 
     public function save();

app/StatisticsCollector/DatabaseStatisticsCollector.php

@@ -19,6 +19,9 @@ class DatabaseStatisticsCollector implements StatisticsCollector
     /** @var int */
     protected $requests = 0;
 
+    /** @var int */
+    protected $cooldowns = 0;
+
     public function __construct(DatabaseInterface $database)
     {
         $this->database = $database;
@@ -34,6 +37,7 @@ public function flush()
         $this->sharedPorts = [];
         $this->sharedSites = [];
         $this->requests = 0;
+        $this->cooldowns = 0;
     }
 
     public function siteShared($authToken = null)
@@ -71,6 +75,15 @@ public function incomingRequest()
         $this->requests++;
     }
 
+    public function cooldownTriggered()
+    {
+        if (! $this->shouldCollectStatistics()) {
+            return;
+        }
+
+        $this->cooldowns++;
+    }
+
     public function save()
     {
         $sharedSites = 0;
@@ -84,15 +97,16 @@ public function save()
         });
 
         $this->database->query('
-                    INSERT INTO statistics (timestamp, shared_sites, shared_ports, unique_shared_sites, unique_shared_ports, incoming_requests)
-                    VALUES (:timestamp, :shared_sites, :shared_ports, :unique_shared_sites, :unique_shared_ports, :incoming_requests)
+                    INSERT INTO statistics (timestamp, shared_sites, shared_ports, unique_shared_sites, unique_shared_ports, incoming_requests, cooldown_count)
+                    VALUES (:timestamp, :shared_sites, :shared_ports, :unique_shared_sites, :unique_shared_ports, :incoming_requests, :cooldown_count)
                 ', [
             'timestamp' => today()->toDateString(),
             'shared_sites' => $sharedSites,
             'shared_ports' => $sharedPorts,
             'unique_shared_sites' => count($this->sharedSites),
             'unique_shared_ports' => count($this->sharedPorts),
             'incoming_requests' => $this->requests,
+            'cooldown_count' => $this->cooldowns,
         ])
         ->then(function () {
             $this->flush();

app/StatisticsRepository/DatabaseStatisticsRepository.php

@@ -29,7 +29,8 @@ public function getStatistics($from, $until): PromiseInterface
                 SUM(shared_ports) as shared_ports,
                 SUM(unique_shared_sites) as unique_shared_sites,
                 SUM(unique_shared_ports) as unique_shared_ports,
-                SUM(incoming_requests) as incoming_requests
+                SUM(incoming_requests) as incoming_requests,
+                SUM(cooldown_count) as cooldown_count
                 FROM statistics
                 WHERE
                 `timestamp` >= "'.$from.'" AND `timestamp` <= "'.$until.'"')

database/migrations/11_add_cooldown_count_to_statistics_table.sql

@@ -0,0 +1 @@
+ALTER TABLE statistics ADD COLUMN cooldown_count INTEGER DEFAULT 0;