Trigger events for Ping and Pong.

top-think · Nov 17, 2023 · 4bf5f1f · 4bf5f1f
1 parent 04a7dab
commit 4bf5f1f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/websocket/Event.php b/src/websocket/Event.php
@@ -7,7 +7,7 @@ class Event
     public $type;
     public $data;
 
-    public function __construct($type, $data)
+    public function __construct($type, $data = null)
     {
         $this->type = $type;
         $this->data = $data;

diff --git a/src/websocket/socketio/Handler.php b/src/websocket/socketio/Handler.php
@@ -23,7 +23,7 @@ class Handler implements HandlerInterface
 
     protected $eio;
 
-    protected $pingTimeoutTimer  = 0;
+    protected $pingTimeoutTimer = 0;
     protected $pingIntervalTimer = 0;
 
     protected $pingInterval;
@@ -89,8 +89,8 @@ public function onMessage(Frame $frame)
                         $this->onConnect($packet->data);
                         break;
                     case Packet::EVENT:
-                        $type   = array_shift($packet->data);
-                        $data   = $packet->data;
+                        $type = array_shift($packet->data);
+                        $data = $packet->data;
                         $result = $this->event->trigger('swoole.websocket.Event', new WsEvent($type, $data));
 
                         if ($packet->id !== null) {
@@ -113,9 +113,11 @@ public function onMessage(Frame $frame)
                 }
                 break;
             case EnginePacket::PING:
+                $this->event->trigger('swoole.websocket.Ping');
                 $this->push(EnginePacket::pong($enginePacket->data));
                 break;
             case EnginePacket::PONG:
+                $this->event->trigger('swoole.websocket.Pong');
                 $this->schedulePing();
                 break;
             default: