Removes connection manager (#20)

* remove connection manager

* formatting

* remove channel manager

* formatting

* handle connection pings

* wip

src/Channels/Channel.php

@@ -39,6 +39,22 @@ public function connections(): array
         return $this->connections->all();
     }
 
+    /**
+     * Find a connection.
+     */
+    public function find(Connection $connection): ?Connection
+    {
+        return $this->connections->find($connection);
+    }
+
+    /**
+     * Find a connection by its ID.
+     */
+    public function findById(string $id): ?Connection
+    {
+        return $this->connections->findById($id);
+    }
+
     /**
      * Subscribe to the given channel.
      */
@@ -70,11 +86,11 @@ public function broadcast(Application $app, array $payload, Connection $except =
     {
         collect($this->connections())
             ->each(function ($connection) use ($payload, $except) {
-                if ($except && $except->identifier() === $connection->connection()->identifier()) {
+                if ($except && $except->id() === $connection->connection()->id()) {
                     return;
                 }
 
-                if (isset($payload['except']) && $payload['except'] === $connection->connection()->identifier()) {
+                if (isset($payload['except']) && $payload['except'] === $connection->connection()->id()) {
                     return;
                 }
 

src/ClientEvent.php

@@ -33,7 +33,7 @@ public static function whisper(Connection $connection, array $payload): void
     {
         Event::dispatch(
             $connection->app(),
-            $payload + ['except' => $connection->identifier()],
+            $payload + ['except' => $connection->id()],
             $connection
         );
     }

src/Contracts/ChannelConnectionManager.php

@@ -17,10 +17,15 @@ public function add(Connection $connection, array $data): void;
     public function remove(Connection $connection): void;
 
     /**
-     * Find a connection by its identifier.
+     * Find a connection in the set.
      */
     public function find(Connection $connection): ?ChannelConnection;
 
+    /**
+     * Find a connection in the set by its ID.
+     */
+    public function findById(string $id): ?ChannelConnection;
+
     /**
      * Get all the connections.
      *

src/Contracts/ChannelManager.php

@@ -24,10 +24,15 @@ public function for(Application $application): ChannelManager;
     public function all(): Collection;
 
     /**
-     * Find the given channel
+     * Find the given channel.
      */
     public function find(string $channel): Channel;
 
+    /**
+     * Get all the connections for the given channels.
+     */
+    public function connections(string $channel = null): Collection;
+
     /**
      * Unsubscribe from all channels.
      */

src/Contracts/Connection.php

@@ -13,7 +13,7 @@ abstract class Connection
     /**
      * The last time the connection was seen.
      */
-    protected string $lastSeenAt;
+    protected ?string $lastSeenAt = null;
 
     /**
      * Stores the ping state of the connection.
@@ -95,19 +95,15 @@ public function disconnect(): void
             ->for($this->app())
             ->unsubscribeFromAll($this);
 
-        App::make(ConnectionManager::class)
-            ->for($this->app())
-            ->disconnect($this->identifier());
-
         $this->terminate();
     }
 
     /**
      * Get the last time the connection was seen.
      */
-    public function lastSeenAt(): Carbon
+    public function lastSeenAt(): ?Carbon
     {
-        return Carbon::parse($this->lastSeenAt);
+        return $this->lastSeenAt ? Carbon::parse($this->lastSeenAt) : null;
     }
 
     /**

src/Contracts/ServerProvider.php

@@ -52,11 +52,6 @@ public function doesNotSubscribeToEvents(): bool
         return $this->shouldNotPublishEvents();
     }
 
-    /**
-     * Build the connection manager for the server.
-     */
-    abstract public function buildConnectionManager(): ConnectionManager;
-
     /**
      * Build the channel manager for the server.
      */

src/Jobs/PingInactiveConnections.php

@@ -4,7 +4,7 @@
 
 use Illuminate\Foundation\Bus\Dispatchable;
 use Laravel\Reverb\Contracts\ApplicationProvider;
-use Laravel\Reverb\Contracts\ConnectionManager;
+use Laravel\Reverb\Contracts\ChannelManager;
 
 class PingInactiveConnections
 {
@@ -13,12 +13,12 @@ class PingInactiveConnections
     /**
      * Execute the job.
      */
-    public function handle(ConnectionManager $connections): void
+    public function handle(ChannelManager $channels): void
     {
         app(ApplicationProvider::class)
             ->all()
-            ->each(function ($application) use ($connections) {
-                collect($connections->for($application)->all())
+            ->each(function ($application) use ($channels) {
+                $channels->for($application)->connections()
                     ->each(function ($connection) {
                         if ($connection->isActive()) {
                             return;

src/Jobs/PruneStaleConnections.php

@@ -4,7 +4,7 @@
 
 use Illuminate\Foundation\Bus\Dispatchable;
 use Laravel\Reverb\Contracts\ApplicationProvider;
-use Laravel\Reverb\Contracts\ConnectionManager;
+use Laravel\Reverb\Contracts\ChannelManager;
 use Laravel\Reverb\Output;
 
 class PruneStaleConnections
@@ -14,16 +14,15 @@ class PruneStaleConnections
     /**
      * Execute the job.
      */
-    public function handle(ConnectionManager $connections): void
+    public function handle(ChannelManager $channels): void
     {
         app(ApplicationProvider::class)
             ->all()
-            ->each(function ($application) use ($connections) {
-                collect($connections->for($application)->all())
+            ->each(function ($application) use ($channels) {
+
+                $channels->for($application)->connections()
                     ->each(function ($connection) {
                         if (! $connection->isStale()) {
-                            dump('Connection is not stale', $connection->id());
-
                             return;
                         }
 

src/Managers/ArrayChannelConnectionManager.php

@@ -20,23 +20,31 @@ class ArrayChannelConnectionManager implements ChannelConnectionManager
      */
     public function add(Connection $connection, array $data): void
     {
-        $this->connections[$connection->identifier()] = new ChannelConnection($connection, $data);
+        $this->connections[$connection->id()] = new ChannelConnection($connection, $data);
     }
 
     /**
      * Remove a connection.
      */
     public function remove(Connection $connection): void
     {
-        unset($this->connections[$connection->identifier()]);
+        unset($this->connections[$connection->id()]);
     }
 
     /**
-     * Find a connection by its identifier.
+     * Find a connection in the set.
      */
     public function find(Connection $connection): ?ChannelConnection
     {
-        return $this->connections[$connection->identifier()] ?? null;
+        return $this->findById($connection->id());
+    }
+
+    /**
+     * Find a connection in the set by its ID.
+     */
+    public function findById(string $id): ?ChannelConnection
+    {
+        return $this->connections[$id] ?? null;
     }
 
     /**

src/Managers/ArrayChannelManager.php

@@ -54,6 +54,18 @@ public function find(string $channel): Channel
         return $this->channels($channel);
     }
 
+    /**
+     * Get all the connections for the given channels.
+     */
+    public function connections(string $channel = null): Collection
+    {
+        $channels = Collection::wrap($this->channels($channel));
+
+        return $channels->reduce(function ($carry, $channel) {
+            return $carry = $carry->merge($channel->connections());
+        }, collect());
+    }
+
     /**
      * Unsubscribe from all channels.
      */