Passing the Socket ID to the broadcastAcrossServers()

beyondcode · Sep 18, 2020 · 30c6635 · 30c6635
1 parent 0f90f52
commit 30c6635
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/src/API/TriggerEvent.php b/src/API/TriggerEvent.php
@@ -45,7 +45,7 @@ public function __invoke(Request $request)
                 );
             } else {
                 $this->channelManager->broadcastAcrossServers(
-                    $request->appId, $channelName, (object) $payload
+                    $request->appId, $request->socket_id, $channelName, (object) $payload
                 );
             }
 

diff --git a/src/ChannelManagers/LocalChannelManager.php b/src/ChannelManagers/LocalChannelManager.php
@@ -259,11 +259,13 @@ public function getGlobalConnectionsCount($appId, string $channelName = null): P
      * Broadcast the message across multiple servers.
      *
      * @param  string|int  $appId
+     * @param  string|null  $socketId
      * @param  string  $channel
      * @param  stdClass  $payload
+     * @param  string|null  $serverId
      * @return bool
      */
-    public function broadcastAcrossServers($appId, string $channel, stdClass $payload)
+    public function broadcastAcrossServers($appId, ?string $socketId, string $channel, stdClass $payload, string $serverId = null)
     {
         return true;
     }

diff --git a/src/ChannelManagers/RedisChannelManager.php b/src/ChannelManagers/RedisChannelManager.php
@@ -268,14 +268,17 @@ public function getGlobalConnectionsCount($appId, string $channelName = null): P
      * Broadcast the message across multiple servers.
      *
      * @param  string|int  $appId
+     * @param  string|null  $socketId
      * @param  string  $channel
      * @param  stdClass  $payload
+     * @param  string|null  $serverId
      * @return bool
      */
-    public function broadcastAcrossServers($appId, string $channel, stdClass $payload)
+    public function broadcastAcrossServers($appId, ?string $socketId, string $channel, stdClass $payload, string $serverId = null)
     {
         $payload->appId = $appId;
-        $payload->serverId = $this->getServerId();
+        $payload->socketId = $socketId;
+        $payload->serverId = $serverId ?: $this->getServerId();
 
         $this->publishClient->publish($this->getRedisKey($appId, $channel), json_encode($payload));
 

diff --git a/src/Channels/Channel.php b/src/Channels/Channel.php
@@ -130,7 +130,7 @@ public function broadcast($appId, stdClass $payload, bool $replicate = true): bo
             ->each->send(json_encode($payload));
 
         if ($replicate) {
-            $this->channelManager->broadcastAcrossServers($appId, $this->getName(), $payload);
+            $this->channelManager->broadcastAcrossServers($appId, null, $this->getName(), $payload);
         }
 
         return true;
@@ -148,7 +148,7 @@ public function broadcast($appId, stdClass $payload, bool $replicate = true): bo
     public function broadcastToEveryoneExcept(stdClass $payload, ?string $socketId, $appId, bool $replicate = true)
     {
         if ($replicate) {
-            $this->channelManager->broadcastAcrossServers($appId, $this->getName(), $payload);
+            $this->channelManager->broadcastAcrossServers($appId, $socketId, $this->getName(), $payload);
         }
 
         if (is_null($socketId)) {

diff --git a/src/Contracts/ChannelManager.php b/src/Contracts/ChannelManager.php
@@ -131,11 +131,13 @@ public function getGlobalConnectionsCount($appId, string $channelName = null): P
      * Broadcast the message across multiple servers.
      *
      * @param  string|int  $appId
+     * @param  string|null  $socketId
      * @param  string  $channel
      * @param  stdClass  $payload
+     * @param  string|null  $serverId
      * @return bool
      */
-    public function broadcastAcrossServers($appId, string $channel, stdClass $payload);
+    public function broadcastAcrossServers($appId, ?string $socketId, string $channel, stdClass $payload, string $serverId = null);
 
     /**
      * Handle the user when it joined a presence channel.

diff --git a/src/DashboardLogger.php b/src/DashboardLogger.php
@@ -90,7 +90,7 @@ public static function log($appId, string $type, array $details = [])
             );
         } else {
             $channelManager->broadcastAcrossServers(
-                $appId, $channelName, (object) $payload
+                $appId, null, $channelName, (object) $payload
             );
         }
     }