Including frames in the MessageEvent

Author: andaniel05

src/Event/MessageEvent.php

@@ -4,12 +4,28 @@
 namespace ThenLabs\WebSocketServer\Event;
 
 use ThenLabs\SocketServer\Event\DataEvent;
+use ThenLabs\SocketServer\Frame;
 
 /**
  * @author Andy Daniel Navarro Taño <[email protected]>
  */
 class MessageEvent extends DataEvent
 {
+    /**
+     * @var Frame[]
+     */
+    protected $frames = [];
+
+    public function setFrames(array $frames): void
+    {
+        $this->frames = $frames;
+    }
+
+    public function getFrames(): array
+    {
+        return $this->frames;
+    }
+
     /**
      * Is alias of getData()
      *

src/WebSocketServer.php

@@ -143,7 +143,12 @@ public function onData(DataEvent $event): void
                         $payload = $previousPayload.$payload;
                     }
 
+                    $frames = $webSocketConnection->getBuffer();
+                    $frames[] = $frame;
+
                     $messageEvent = new MessageEvent($this, $webSocketConnection, $payload);
+                    $messageEvent->setFrames($frames);
+
                     $this->dispatcher->dispatch($messageEvent);
                     break;
 

tests/Functional/MyWebSocketServer.php

@@ -0,0 +1,26 @@
+<?php
+
+use ThenLabs\WebSocketServer\Event\MessageEvent;
+use ThenLabs\WebSocketServer\Event\OpenEvent;
+use ThenLabs\WebSocketServer\WebSocketServer;
+
+class MyWebSocketServer extends WebSocketServer
+{
+    public function onOpen(OpenEvent $event): void
+    {
+        sleep(1);
+
+        $connection = $event->getConnection();
+        $request = $event->getRequest();
+
+        $connection->send('New WebSocketConnection to the path: '.$request->getRequestUri());
+    }
+
+    public function onMessage(MessageEvent $event): void
+    {
+        $connection = $event->getConnection();
+
+        // responds with the same message.
+        $connection->send($event->getData());
+    }
+}

tests/Functional/run-server.php

@@ -1,32 +1,7 @@
 <?php
 
 require_once __DIR__.'/../../bootstrap.php';
-
-use Monolog\Handler\StreamHandler;
-use ThenLabs\WebSocketServer\Event\MessageEvent;
-use ThenLabs\WebSocketServer\Event\OpenEvent;
-use ThenLabs\WebSocketServer\WebSocketServer;
-
-class MyWebSocketServer extends WebSocketServer
-{
-    public function onOpen(OpenEvent $event): void
-    {
-        sleep(1);
-
-        $connection = $event->getConnection();
-        $request = $event->getRequest();
-
-        $connection->send('New WebSocketConnection to the path: '.$request->getRequestUri());
-    }
-
-    public function onMessage(MessageEvent $event): void
-    {
-        $connection = $event->getConnection();
-
-        // responds with the same message.
-        $connection->send($event->getData());
-    }
-}
+require_once __DIR__.'/MyWebSocketServer.php';
 
 $config = [
     'host'       => $argv[1] ?? '127.0.0.1',
@@ -35,6 +10,4 @@ public function onMessage(MessageEvent $event): void
 ];
 
 $server = new MyWebSocketServer($config);
-$server->getLogger()->pushHandler(new StreamHandler(LOGS_FILE));
-
 $server->start();