use arrays

laravel · Nov 22, 2023 · 380dfc4 · 380dfc4
1 parent 75e85b0
commit 380dfc4
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 60 deletions.
diff --git a/src/Channels/Channel.php b/src/Channels/Channel.php
@@ -82,29 +82,28 @@ public function subscribed(Connection $connection): bool
     /**
      * Send a message to all connections subscribed to the channel.
      */
-    public function broadcast(Application $app, array $payload, Connection $except = null): void
+    public function broadcast(array $payload, Connection $except = null): void
     {
-        collect($this->connections())
-            ->each(function ($connection) use ($payload, $except) {
-                if ($except && $except->id() === $connection->connection()->id()) {
-                    return;
-                }
+        foreach ($this->connections as $connection) {
+            if ($except && $except->id() === $connection->connection()->id()) {
+                return;
+            }
 
-                if (isset($payload['except']) && $payload['except'] === $connection->connection()->id()) {
-                    return;
-                }
+            if (isset($payload['except']) && $payload['except'] === $connection->connection()->id()) {
+                return;
+            }
 
-                try {
-                    $connection->send(
-                        json_encode(
-                            Arr::except($payload, 'except')
-                        )
-                    );
-                } catch (Exception $e) {
-                    // Output::error('Broadcasting to '.$connection->id().' resulted in an error');
-                    // Output::info($e->getMessage());
-                }
-            });
+            try {
+                $connection->send(
+                    json_encode(
+                        Arr::except($payload, 'except')
+                    )
+                );
+            } catch (Exception $e) {
+                // Output::error('Broadcasting to '.$connection->id().' resulted in an error');
+                // Output::info($e->getMessage());
+            }
+        }
     }
 
     /**

diff --git a/src/Channels/PresenceChannel.php b/src/Channels/PresenceChannel.php
@@ -14,7 +14,6 @@ public function subscribe(Connection $connection, string $auth = null, string $d
         parent::subscribe($connection, $auth, $data);
 
         $this->broadcast(
-            $connection->app(),
             [
                 'event' => 'pusher_internal:member_added',
                 'data' => $data ? json_decode($data, true) : [],
@@ -37,7 +36,6 @@ public function unsubscribe(Connection $connection): void
 
         if ($userId = $subscription->data('user_id')) {
             $this->broadcast(
-                $connection->app(),
                 [
                     'event' => 'pusher_internal:member_removed',
                     'data' => ['user_id' => $userId],

diff --git a/src/Contracts/ChannelManager.php b/src/Contracts/ChannelManager.php
@@ -2,7 +2,6 @@
 
 namespace Laravel\Reverb\Contracts;
 
-use Illuminate\Support\Collection;
 use Laravel\Reverb\Application;
 use Laravel\Reverb\Channels\Channel;
 
@@ -21,7 +20,7 @@ public function for(Application $application): ChannelManager;
     /**
      * Get all the channels.
      */
-    public function all(): Collection;
+    public function all(): array;
 
     /**
      * Find the given channel.
@@ -31,7 +30,7 @@ public function find(string $channel): Channel;
     /**
      * Get all the connections for the given channels.
      */
-    public function connections(string $channel = null): Collection;
+    public function connections(string $channel = null): array;
 
     /**
      * Unsubscribe from all channels.

diff --git a/src/Event.php b/src/Event.php
@@ -41,7 +41,7 @@ public static function dispatchSynchronously(Application $app, array $payload, C
             $channel = app(ChannelManager::class)->for($app)->find($channel);
             $payload['channel'] = $channel->name();
 
-            $channel->broadcast($app, $payload, $connection);
+            $channel->broadcast($payload, $connection);
         }
     }
 }
diff --git a/src/Jobs/PingInactiveConnections.php b/src/Jobs/PingInactiveConnections.php
@@ -18,14 +18,13 @@ public function handle(ChannelManager $channels): void
         app(ApplicationProvider::class)
             ->all()
             ->each(function ($application) use ($channels) {
-                $channels->for($application)->connections()
-                    ->each(function ($connection) {
-                        if ($connection->isActive()) {
-                            return;
-                        }
+                foreach ($channels->for($application)->connections() as $connection) {
+                    if ($connection->isActive()) {
+                        return;
+                    }
 
-                        $connection->ping();
-                    });
+                    $connection->ping();
+                }
             });
     }
 }
diff --git a/src/Jobs/PruneStaleConnections.php b/src/Jobs/PruneStaleConnections.php
@@ -19,25 +19,22 @@ public function handle(ChannelManager $channels): void
         app(ApplicationProvider::class)
             ->all()
             ->each(function ($application) use ($channels) {
-
-                $channels->for($application)->connections()
-                    ->each(function ($connection) {
-                        if (! $connection->isStale()) {
-                            return;
-                        }
-
-                        $connection->send(json_encode([
-                            'event' => 'pusher:error',
-                            'data' => json_encode([
-                                'code' => 4201,
-                                'message' => 'Pong reply not received in time',
-                            ]),
-                        ]));
-
-                        $connection->disconnect();
-
-                        // Output::info('Connection Pruned', $connection->id());
-                    });
+                foreach ($channels->for($application)->connections() as $connection) {
+                    if (! $connection->isStale()) {
+                        return;
+                    }
+
+                    $connection->send(json_encode([
+                        'event' => 'pusher:error',
+                        'data' => json_encode([
+                            'code' => 4201,
+                            'message' => 'Pong reply not received in time',
+                        ]),
+                    ]));
+
+                    $connection->disconnect();
+                    // Output::info('Connection Pruned', $connection->id());
+                }
             });
     }
 }
diff --git a/src/Managers/ArrayChannelManager.php b/src/Managers/ArrayChannelManager.php
@@ -2,7 +2,7 @@
 
 namespace Laravel\Reverb\Managers;
 
-use Illuminate\Support\Collection;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\App;
 use Laravel\Reverb\Application;
 use Laravel\Reverb\Channels\Channel;
@@ -41,9 +41,9 @@ public function app(): ?Application
     /**
      * Get all the channels.
      */
-    public function all(): Collection
+    public function all(): array
     {
-        return collect($this->channels());
+        return $this->channels();
     }
 
     /**
@@ -57,13 +57,13 @@ public function find(string $channel): Channel
     /**
      * Get all the connections for the given channels.
      */
-    public function connections(string $channel = null): Collection
+    public function connections(string $channel = null): array
     {
-        $channels = Collection::wrap($this->channels($channel));
+        $channels = Arr::wrap($this->channels($channel));
 
-        return $channels->reduce(function ($carry, $channel) {
-            return $carry = $carry->merge($channel->connections());
-        }, collect());
+        return array_reduce($channels, function ($carry, $channel) {
+            return $carry + $channel->connections();
+        }, []);
     }
 
     /**