Merge remote-tracking branch 'michaelnabil230/events' into events

src/Events/Concerns/Dispatchable.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Laravel\Reverb\Events\Concerns;
+
+use Laravel\Reverb\Loggers\Log;
+
+trait Dispatchable
+{
+    /**
+     * Dispatch the event with the given arguments.
+     *
+     * @return mixed
+     */
+    public static function dispatch()
+    {
+        try {
+            return event(new static(...func_get_args()));
+        } catch (\Exception $exception) {
+            Log::error($exception->getMessage());
+        }
+    }
+}

src/Events/ConnectionClosed.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Laravel\Reverb\Events;
+
+use Laravel\Reverb\Contracts\Connection;
+use Laravel\Reverb\Events\Concerns\Dispatchable;
+
+class ConnectionClosed
+{
+    use Dispatchable;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(public Connection $connection)
+    {
+        //
+    }
+}

src/Events/ConnectionError.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Laravel\Reverb\Events;
+
+use Laravel\Reverb\Contracts\Connection;
+use Laravel\Reverb\Events\Concerns\Dispatchable;
+
+class ConnectionError
+{
+    use Dispatchable;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(public Connection $connection, public \Exception $exception)
+    {
+        //
+    }
+}

src/Events/MessageReceived.php

@@ -2,8 +2,8 @@
 
 namespace Laravel\Reverb\Events;
 
-use Illuminate\Foundation\Events\Dispatchable;
 use Laravel\Reverb\Contracts\Connection;
+use Laravel\Reverb\Events\Concerns\Dispatchable;
 
 class MessageReceived
 {

src/Events/MessageSent.php

@@ -2,8 +2,8 @@
 
 namespace Laravel\Reverb\Events;
 
-use Illuminate\Foundation\Events\Dispatchable;
 use Laravel\Reverb\Contracts\Connection;
+use Laravel\Reverb\Events\Concerns\Dispatchable;
 
 class MessageSent
 {

src/Events/NewConnection.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Laravel\Reverb\Events;
+
+use Laravel\Reverb\Contracts\Connection;
+use Laravel\Reverb\Events\Concerns\Dispatchable;
+
+class NewConnection
+{
+    use Dispatchable;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(public Connection $connection)
+    {
+        //
+    }
+}

src/Events/ServerStarted.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Laravel\Reverb\Events;
+
+use Laravel\Reverb\Events\Concerns\Dispatchable;
+
+class ServerStarted
+{
+    use Dispatchable;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct()
+    {
+        //
+    }
+}

src/Events/ServerStopped.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Laravel\Reverb\Events;
+
+use Laravel\Reverb\Events\Concerns\Dispatchable;
+
+class ServerStopped
+{
+    use Dispatchable;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct()
+    {
+        //
+    }
+}

src/Events/SubscribedToChannel.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Laravel\Reverb\Events;
+
+use Laravel\Reverb\Contracts\Connection;
+use Laravel\Reverb\Events\Concerns\Dispatchable;
+
+class SubscribedToChannel
+{
+    use Dispatchable;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(
+        public Connection $connection,
+        public string $channelName,
+        public ?string $auth = null,
+    ) {
+        //
+    }
+}

src/Events/UnsubscribedFromChannel.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Laravel\Reverb\Events;
+
+use Laravel\Reverb\Contracts\Connection;
+use Laravel\Reverb\Events\Concerns\Dispatchable;
+
+class UnsubscribedFromChannel
+{
+    use Dispatchable;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(
+        public Connection $connection,
+        public string $channelName,
+    ) {
+        //
+    }
+}

src/Protocols/Pusher/Channels/Channel.php

@@ -4,6 +4,8 @@
 
 use Laravel\Reverb\Contracts\Connection;
 use Laravel\Reverb\Loggers\Log;
+use Laravel\Reverb\Events\SubscribedToChannel;
+use Laravel\Reverb\Events\UnsubscribedFromChannel;
 use Laravel\Reverb\Protocols\Pusher\Concerns\SerializesChannels;
 use Laravel\Reverb\Protocols\Pusher\Contracts\ChannelConnectionManager;
 use Laravel\Reverb\Protocols\Pusher\Contracts\ChannelManager;
@@ -67,6 +69,8 @@ public function findById(string $id): ?Connection
     public function subscribe(Connection $connection, ?string $auth = null, ?string $data = null): void
     {
         $this->connections->add($connection, $data ? json_decode($data, associative: true, flags: JSON_THROW_ON_ERROR) : []);
+
+        SubscribedToChannel::dispatch($connection, $this->name(), $auth);
     }
 
     /**
@@ -79,6 +83,8 @@ public function unsubscribe(Connection $connection): void
         if ($this->connections->isEmpty()) {
             app(ChannelManager::class)->for($connection->app())->remove($this);
         }
+
+        UnsubscribedFromChannel::dispatch($connection, $this->name());
     }
 
     /**

src/Protocols/Pusher/Server.php

@@ -5,7 +5,10 @@
 use Exception;
 use Illuminate\Support\Str;
 use Laravel\Reverb\Contracts\Connection;
+use Laravel\Reverb\Events\ConnectionClosed;
+use Laravel\Reverb\Events\ConnectionError;
 use Laravel\Reverb\Events\MessageReceived;
+use Laravel\Reverb\Events\NewConnection;
 use Laravel\Reverb\Loggers\Log;
 use Laravel\Reverb\Protocols\Pusher\Contracts\ChannelManager;
 use Laravel\Reverb\Protocols\Pusher\Exceptions\InvalidOrigin;
@@ -34,6 +37,8 @@ public function open(Connection $connection): void
             $this->handler->handle($connection, 'pusher:connection_established');
 
             Log::info('Connection Established', $connection->id());
+
+            NewConnection::dispatch($connection);
         } catch (Exception $e) {
             $this->error($connection, $e);
         }
@@ -82,6 +87,8 @@ public function close(Connection $connection): void
         $connection->disconnect();
 
         Log::info('Connection Closed', $connection->id());
+
+        ConnectionClosed::dispatch($connection);
     }
 
     /**
@@ -93,21 +100,21 @@ public function error(Connection $connection, Exception $exception): void
             $connection->send(json_encode($exception->payload()));
 
             Log::error('Message from '.$connection->id().' resulted in a pusher error');
-            Log::info($exception->getMessage());
-
-            return;
+        } else {
+            $connection->send(json_encode([
+                'event' => 'pusher:error',
+                'data' => json_encode([
+                    'code' => 4200,
+                    'message' => 'Invalid message format',
+                ]),
+            ]));
+
+            Log::error('Message from '.$connection->id().' resulted in an unknown error');
         }
 
-        $connection->send(json_encode([
-            'event' => 'pusher:error',
-            'data' => json_encode([
-                'code' => 4200,
-                'message' => 'Invalid message format',
-            ]),
-        ]));
-
-        Log::error('Message from '.$connection->id().' resulted in an unknown error');
         Log::info($exception->getMessage());
+
+        ConnectionError::dispatch($connection, $exception);
     }
 
     /**

src/Servers/Reverb/Console/Commands/StartServer.php

@@ -7,6 +7,8 @@
 use Laravel\Reverb\Application;
 use Laravel\Reverb\Contracts\ApplicationProvider;
 use Laravel\Reverb\Contracts\Logger;
+use Laravel\Reverb\Events\ServerStarted;
+use Laravel\Reverb\Events\ServerStopped;
 use Laravel\Reverb\Jobs\PingInactiveConnections;
 use Laravel\Reverb\Jobs\PruneStaleConnections;
 use Laravel\Reverb\Loggers\CliLogger;
@@ -72,6 +74,8 @@ public function handle(): void
         $this->components->info('Starting '.($server->isSecure() ? 'secure ' : '')."server on {$host}:{$port}".(($hostname && $hostname !== $host) ? " ({$hostname})" : ''));
 
         $server->start();
+
+        ServerStarted::dispatch();
     }
 
     /**
@@ -112,6 +116,8 @@ protected function ensureRestartCommandIsRespected(Server $server, LoopInterface
 
             $server->stop();
 
+            ServerStopped::dispatch();
+
             $this->components->info("Stopping server on {$host}:{$port}");
         });
     }