Using separate connection counts for global & local.

Author: rennokki

src/PubSub/Drivers/LocalClient.php

@@ -164,9 +164,20 @@ public function channelMemberCounts($appId, array $channelNames): PromiseInterfa
      * Get the amount of unique connections.
      *
      * @param  mixed  $appId
+     * @return null|int
+     */
+    public function getLocalConnectionsCount($appId)
+    {
+        return null;
+    }
+
+    /**
+     * Get the amount of connections aggregated on multiple instances.
+     *
+     * @param  mixed  $appId
      * @return null|int|\React\Promise\PromiseInterface
      */
-    public function appConnectionsCount($appId)
+    public function getGlobalConnectionsCount($appId)
     {
         return null;
     }

src/PubSub/Drivers/RedisClient.php

@@ -292,13 +292,22 @@ public function channelMemberCounts($appId, array $channelNames): PromiseInterfa
      * Get the amount of unique connections.
      *
      * @param  mixed  $appId
-     * @return null|int|\React\Promise\PromiseInterface
+     * @return null|int
      */
-    public function appConnectionsCount($appId)
+    public function getLocalConnectionsCount($appId)
     {
-        // Use the in-built Redis manager to avoid async run.
+        return null;
+    }
 
-        return $this->publishClient->hget($this->getTopicName($appId), 'connections') ?: 0;
+    /**
+     * Get the amount of connections aggregated on multiple instances.
+     *
+     * @param  mixed  $appId
+     * @return null|int|\React\Promise\PromiseInterface
+     */
+    public function getGlobalConnectionsCount($appId)
+    {
+        return $this->publishClient->hget($this->getTopicName($appId), 'connections');
     }
 
     /**

src/PubSub/ReplicationInterface.php

@@ -106,7 +106,15 @@ public function channelMemberCounts($appId, array $channelNames): PromiseInterfa
      * Get the amount of unique connections.
      *
      * @param  mixed  $appId
+     * @return null|int
+     */
+    public function getLocalConnectionsCount($appId);
+
+    /**
+     * Get the amount of connections aggregated on multiple instances.
+     *
+     * @param  mixed  $appId
      * @return null|int|\React\Promise\PromiseInterface
      */
-    public function appConnectionsCount($appId);
+    public function getGlobalConnectionsCount($appId);
 }

src/Statistics/Logger/MemoryStatisticsLogger.php

@@ -105,7 +105,7 @@ public function save()
 
             $this->createRecord($statistic, $appId);
 
-            $currentConnectionCount = $this->channelManager->getConnectionCount($appId);
+            $currentConnectionCount = $this->channelManager->getGlobalConnectionsCount($appId);
 
             $statistic->reset($currentConnectionCount);
         }

src/Statistics/Logger/RedisStatisticsLogger.php

@@ -124,7 +124,7 @@ public function save()
 
                 $this->createRecord($statistic, $appId);
 
-                $currentConnectionCount = $this->channelManager->getConnectionCount($appId);
+                $currentConnectionCount = $this->channelManager->getGlobalConnectionsCount($appId);
 
                 $currentConnectionCount === 0
                     ? $this->resetAppTraces($appId)

src/WebSockets/Channels/ChannelManager.php

@@ -38,7 +38,15 @@ public function getChannels($appId): array;
      * @param  mixed  $appId
      * @return int
      */
-    public function getConnectionCount($appId): int;
+    public function getLocalConnectionsCount($appId): int;
+
+    /**
+     * Get the connections count across multiple servers.
+     *
+     * @param  mixed  $appId
+     * @return int
+     */
+    public function getGlobalConnectionsCount($appId): int;
 
     /**
      * Remove connection from all channels.

src/WebSockets/Channels/ChannelManagers/ArrayChannelManager.php

@@ -73,7 +73,7 @@ public function getChannels($appId): array
      * @param  mixed  $appId
      * @return int
      */
-    public function getConnectionCount($appId): int
+    public function getLocalConnectionsCount($appId): int
     {
         return collect($this->getChannels($appId))
             ->flatMap(function (Channel $channel) {
@@ -83,6 +83,17 @@ public function getConnectionCount($appId): int
             ->count();
     }
 
+    /**
+     * Get the connections count across multiple servers.
+     *
+     * @param  mixed  $appId
+     * @return int
+     */
+    public function getGlobalConnectionsCount($appId): int
+    {
+        return $this->getLocalConnectionsCount($appId);
+    }
+
     /**
      * Remove connection from all channels.
      *

src/WebSockets/Channels/ChannelManagers/RedisChannelManager.php

@@ -24,13 +24,13 @@ public function __construct()
     }
 
     /**
-     * Get the connections count on the app.
+     * Get the connections count across multiple servers.
      *
      * @param  mixed  $appId
      * @return int
      */
-    public function getConnectionCount($appId): int
+    public function getGlobalConnectionsCount($appId): int
     {
-        return $this->replicator->appConnectionsCount($appId);
+        return $this->replicator->getGlobalConnectionsCount($appId);
     }
 }

src/WebSockets/WebSocketHandler.php

@@ -165,7 +165,7 @@ protected function verifyOrigin(ConnectionInterface $connection)
     protected function limitConcurrentConnections(ConnectionInterface $connection)
     {
         if (! is_null($capacity = $connection->app->capacity)) {
-            $connectionsCount = $this->channelManager->getConnectionCount($connection->app->id);
+            $connectionsCount = $this->channelManager->getGlobalConnectionsCount($connection->app->id);
 
             if ($connectionsCount >= $capacity) {
                 throw new ConnectionsOverCapacity();

tests/Mocks/FakeMemoryStatisticsLogger.php

@@ -12,7 +12,7 @@ class FakeMemoryStatisticsLogger extends MemoryStatisticsLogger
     public function save()
     {
         foreach ($this->statistics as $appId => $statistic) {
-            $currentConnectionCount = $this->channelManager->getConnectionCount($appId);
+            $currentConnectionCount = $this->channelManager->getLocalConnectionsCount($appId);
             $statistic->reset($currentConnectionCount);
         }
     }