store connection data

src/Channels/Channel.php

@@ -62,11 +62,11 @@ public function broadcast(Application $app, array $payload, Connection $except =
     {
         collect($this->connections())
             ->each(function ($connection) use ($payload, $except) {
-                if ($except && $except->identifier() === $connection->identifier()) {
+                if ($except && $except->identifier() === $connection->connection()->identifier()) {
                     return;
                 }
 
-                if (isset($payload['except']) && $payload['except'] === $connection->identifier()) {
+                if (isset($payload['except']) && $payload['except'] === $connection->connection()->identifier()) {
                     return;
                 }
 

src/Contracts/ChannelConnectionManager.php

@@ -7,7 +7,7 @@ interface ChannelConnectionManager
     /**
      * Add a connection.
      */
-    public function add(Connection $connection): void;
+    public function add(Connection $connection, array $data): void;
 
     /**
      * Remove a connection.
@@ -16,6 +16,7 @@ public function remove(Connection $connection): void;
 
     /**
      * Get all the connections.
+     * @return array<string, \Laravel\Reverb\Servers\Reverb\ChannelConnection>
      */
     public function all(): array;
 

src/Managers/ArrayChannelConnectionManager.php

@@ -4,22 +4,23 @@
 
 use Laravel\Reverb\Contracts\ChannelConnectionManager;
 use Laravel\Reverb\Contracts\Connection;
+use Laravel\Reverb\Servers\Reverb\ChannelConnection;
 
 class ArrayChannelConnectionManager implements ChannelConnectionManager
 {
     /**
      * Connection store.
      *
-     * @var array<string, array<string, \Laravel\Reverb\Connection>>
+     * @var array<string, \Laravel\Reverb\Servers\Reverb\ChannelConnection>
      */
     protected $connections = [];
 
     /**
      * Add a connection.
      */
-    public function add(Connection $connection): void
+    public function add(Connection $connection, array $data): void
     {
-        $this->connections[$connection->identifier()] = $connection;
+        $this->connections[$connection->identifier()] = new ChannelConnection($connection, $data);
     }
 
     /**

src/Servers/Reverb/ChannelConnection.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Laravel\Reverb\Servers\Reverb;
+
+use Laravel\Reverb\Contracts\Connection;
+
+class ChannelConnection
+{
+    public function __construct(protected Connection $connection, protected array $data = [])
+    {
+        //
+    }
+
+    /**
+     * Get the underlying connection.
+     */
+    public function connection(): Connection
+    {
+        return $this->connection;
+    }
+
+    /**
+     * Get the connection data.
+     */
+    public function data(): array
+    {
+        return $this->data;
+    }
+
+    /**
+     * Call the method on the connection.
+     */
+    public function __call(string $method, array $parameters): mixed
+    {
+        return $this->connection->{$method}(...$parameters);
+    }
+}

tests/Pest.php

@@ -8,6 +8,7 @@
 use Laravel\Reverb\Contracts\Connection as ReverbConnection;
 use Laravel\Reverb\Contracts\ConnectionManager;
 use Laravel\Reverb\Managers\Connections;
+use Laravel\Reverb\Servers\Reverb\ChannelConnection;
 use Laravel\Reverb\Tests\Connection;
 use Laravel\Reverb\Tests\SerializableConnection;
 use Laravel\Reverb\Tests\TestCase;
@@ -24,9 +25,11 @@
 function connections(int $count = 1, $serializable = false): array
 {
     return Collection::make(range(1, $count))->map(function () use ($serializable) {
-        return $serializable
+        return new ChannelConnection(
+                $serializable
                     ? new SerializableConnection(Uuid::uuid4())
-                    : new Connection(Uuid::uuid4());
+                    : new Connection(Uuid::uuid4())
+        );
     })->all();
 }
 

tests/Unit/Channels/ChannelTest.php

@@ -54,7 +54,7 @@
         ->once()
         ->andReturn($connections = connections(3));
 
-    $channel->broadcast(app(ApplicationProvider::class)->findByKey('pusher-key'), ['foo' => 'bar'], $connections[0]);
+    $channel->broadcast(app(ApplicationProvider::class)->findByKey('pusher-key'), ['foo' => 'bar'], $connections[0]->connection());
 
     $connections[0]->assertNothingSent();
     collect(array_slice($connections, -2))->each(fn ($connection) => $connection->assertSent(['foo' => 'bar']));

tests/Unit/ClientEventTest.php

@@ -2,6 +2,7 @@
 
 use Laravel\Reverb\ClientEvent;
 use Laravel\Reverb\Contracts\ChannelConnectionManager;
+use Laravel\Reverb\Servers\Reverb\ChannelConnection;
 use Laravel\Reverb\Tests\Connection;
 
 beforeEach(function () {
@@ -33,7 +34,7 @@
 it('does not forward a message to itself', function () {
     $this->channelConnectionManager->shouldReceive('all')
         ->once()
-        ->andReturn([$this->connection]);
+        ->andReturn([new ChannelConnection($this->connection)]);
 
     ClientEvent::handle(
         $this->connection, [

tests/Unit/Jobs/PingInactiveConnectionsTest.php

@@ -20,7 +20,7 @@
         ->andReturn($connections);
 
     $connections = collect($connections)->each(function ($connection) use ($channel) {
-        $channel->subscribe($connection);
+        $channel->subscribe($connection->connection());
         $connection->setLastSeenAt(now()->subMinutes(10));
     });
 

tests/Unit/Jobs/PruneStaleConnectionsTest.php

@@ -26,13 +26,13 @@
         ->andReturn($connections);
 
     collect($connections)->each(function ($connection) use ($channel) {
-        $channel->subscribe($connection);
+        $channel->subscribe($connection->connection());
         $connection->setLastSeenAt(now()->subMinutes(10));
         $connection->setHasBeenPinged();
 
         $this->channelManager->shouldReceive('unsubscribeFromAll')
             ->once()
-            ->with($connection);
+            ->with($connection->connection());
     });
 
     (new PruneStaleConnections)->handle(

tests/Unit/Managers/ChannelMangerTest.php

@@ -15,16 +15,16 @@
 
 it('can subscribe to a channel', function () {
     collect(connections(5))
-        ->each(fn ($connection) => $this->channel->subscribe($connection));
+        ->each(fn ($connection) => $this->channel->subscribe($connection->connection()));
 
     expect($this->channel->connections())->toHaveCount(5);
 });
 
 it('can unsubscribe from a channel', function () {
     $connections = collect(connections(5))
-        ->each(fn ($connection) => $this->channel->subscribe($connection));
+        ->each(fn ($connection) => $this->channel->subscribe($connection->connection()));
 
-    $this->channel->unsubscribe($connections->first());
+    $this->channel->unsubscribe($connections->first()->connection());
 
     expect($this->channel->connections())->toHaveCount(4);
 });
@@ -42,10 +42,10 @@
 
 it('can get all connections subscribed to a channel', function () {
     $connections = collect(connections(5))
-        ->each(fn ($connection) => $this->channel->subscribe($connection));
+        ->each(fn ($connection) => $this->channel->subscribe($connection->connection()));
 
     $connections->each(fn ($connection) => expect($connection->identifier())
-        ->toBeIn(collect($this->channel->connections())->pluck('identifier')->all()));
+        ->toBeIn(array_keys($this->channel->connections())));
 });
 
 it('can unsubscribe a connection for all channels', function () {
@@ -83,19 +83,19 @@
     $connections = collect($connections)->split(3);
 
     $connections->first()->each(function ($connection) use ($channelOne, $channelTwo, $channelThree) {
-        $channelOne->subscribe($connection);
-        $channelTwo->subscribe($connection);
-        $channelThree->subscribe($connection);
+        $channelOne->subscribe($connection->connection());
+        $channelTwo->subscribe($connection->connection());
+        $channelThree->subscribe($connection->connection());
     });
 
     $connections->get(1)->each(function ($connection) use ($channelTwo, $channelThree) {
-        $channelTwo->subscribe($connection);
+        $channelTwo->subscribe($connection->connection());
 
-        $channelThree->subscribe($connection);
+        $channelThree->subscribe($connection->connection());
     });
 
     $connections->last()->each(function ($connection) use ($channelThree) {
-        $channelThree->subscribe($connection);
+        $channelThree->subscribe($connection->connection());
     });
 
     expect($channelOne->connections())->toHaveCount(4);

tests/Unit/Managers/ConnectionMangerTest.php

@@ -52,7 +52,7 @@ function () {
 
 it('can get all connections', function () {
     $connections = collect(connections(10));
-    $connections->each(fn ($connection) => $this->connectionManager->save($connection));
+    $connections->each(fn ($connection) => $this->connectionManager->save($connection->connection()));
 
     expect($this->connectionManager->all())
         ->toHaveCount(10);