From fc23dff3d959ec3b4b6d97fba6ab4ca948a48c3e Mon Sep 17 00:00:00 2001
From: a6a2f5842 <office@blax.at>
Date: Mon, 15 Sep 2025 16:22:59 +0200
Subject: [PATCH] BF channel subscription

---
 src/Websocket/Handler.php | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/Websocket/Handler.php b/src/Websocket/Handler.php
index 0bd1dcb..de48f95 100644
--- a/src/Websocket/Handler.php
+++ b/src/Websocket/Handler.php
@@ -106,13 +106,13 @@ class Handler implements MessageComponentInterface
                 return gc_collect_cycles();
             }
 
-            $this->handleChannelSubscriptions($message, $connection);
+            $channel = $this->handleChannelSubscriptions($message, $connection);
 
-            if (! $channel = $this->get_connection_channel($connection, $message)) {
+            if (! $channel->hasConnection($connection) ) {
                 return $connection->send(json_encode([
                     'event' => $message['event'] . ':error',
                     'data' => [
-                        'message' => 'Channel not established',
+                        'message' => 'Subscription not established',
                         'meta' => $message,
                     ],
                 ]));
@@ -362,27 +362,20 @@ class Handler implements MessageComponentInterface
             $message['channel']
         );
 
-        if (! $channel->hasConnection($connection)) {
-            try{
-                $channel->subscribe($connection, (object) $message);
-            } catch (\Throwable $e) {
-                return null;
-            }
-        }
-
         return $this->channelManager->find(
             $connection->app->id,
             $message['channel']
         );
     }
 
-    protected function handleChannelSubscriptions($message, $connection)
+    protected function handleChannelSubscriptions($message, $connection) : ?Channel
     {
-        $channel_name = optional($this->get_connection_channel($connection, $message))->getName();
+        $channel = $this->get_connection_channel($connection, $message);
+        $channel_name = optional($channel)->getName();
         $socket_id = $connection->socketId;
 
-        if(! $channel_name) {
-            return;
+        if(! $channel_name || ! $channel) {
+            return null;
         }
 
         // if not in $channel_connections add it
@@ -405,7 +398,13 @@ class Handler implements MessageComponentInterface
                 array_keys($this->channel_connections)
             );
 
-            $channel->subscribe($connection, $message);
+            if (! $channel->hasConnection($connection)) {
+                try{
+                    $channel->subscribe($connection, (object) $message);
+                } catch (\Throwable $e) {
+                    return null;
+                }
+            }
         }
 
         if (strpos($message['event'], '.unsubscribe') !== false) {
@@ -434,7 +433,7 @@ class Handler implements MessageComponentInterface
             Log::channel('websocket')->info('Tenant left', ['socketId' => $socket_id, 'channel' => $channel_name]);
         }
 
-        return $this;
+        return $channel;
     }
 
     protected function setRequest($message, $connection)