完善socketio

src/Websocket.php

@@ -80,6 +80,7 @@ public function onOpen($fd, Request $request)
      */
     public function onMessage(Frame $frame)
     {
+        $this->event->trigger("swoole.websocket.Message", $frame);
         $this->event->trigger("swoole.websocket.Event", $this->decode($frame->data));
     }
 
@@ -172,33 +173,7 @@ public function leave($rooms = []): self
         return $this;
     }
 
-    protected function encode(string $event, $data)
-    {
-        return json_encode([
-            'type' => $event,
-            'data' => $data,
-        ]);
-    }
-
-    protected function decode($payload)
-    {
-        $data = json_decode($payload, true);
-
-        return [
-            'type' => $data['type'] ?? null,
-            'data' => $data['data'] ?? null,
-        ];
-    }
-
-    /**
-     * Emit data and reset some status.
-     *
-     * @param string
-     * @param mixed
-     *
-     * @return boolean
-     */
-    public function emit(string $event, $data = null): bool
+    public function push($data)
     {
         $fds      = $this->getFds();
         $assigned = !empty($this->getTo());
@@ -213,7 +188,7 @@ public function emit(string $event, $data = null): bool
                 'descriptors' => $fds,
                 'broadcast'   => $this->isBroadcast(),
                 'assigned'    => $assigned,
-                'payload'     => $this->encode($event, $data),
+                'payload'     => $data,
             ]);
 
             $result = $this->server->task($job);
@@ -224,6 +199,29 @@ public function emit(string $event, $data = null): bool
         }
     }
 
+    public function emit(string $event, $data = null): bool
+    {
+        return $this->push($this->encode([
+            'type' => $event,
+            'data' => $data,
+        ]));
+    }
+
+    protected function encode($packet)
+    {
+        return json_encode($packet);
+    }
+
+    protected function decode($payload)
+    {
+        $data = json_decode($payload, true);
+
+        return [
+            'type' => $data['type'] ?? null,
+            'data' => $data['data'] ?? null,
+        ];
+    }
+
     /**
      * Close current connection.
      *

src/websocket/socketio/EnginePacket.php

@@ -0,0 +1,81 @@
+<?php
+
+namespace think\swoole\websocket\socketio;
+
+class EnginePacket
+{
+    /**
+     * Engine.io packet type `open`.
+     */
+    const OPEN = 0;
+
+    /**
+     * Engine.io packet type `close`.
+     */
+    const CLOSE = 1;
+
+    /**
+     * Engine.io packet type `ping`.
+     */
+    const PING = 2;
+
+    /**
+     * Engine.io packet type `pong`.
+     */
+    const PONG = 3;
+
+    /**
+     * Engine.io packet type `message`.
+     */
+    const MESSAGE = 4;
+
+    /**
+     * Engine.io packet type 'upgrade'
+     */
+    const UPGRADE = 5;
+
+    /**
+     * Engine.io packet type `noop`.
+     */
+    const NOOP = 6;
+
+    public $type;
+
+    public $data = '';
+
+    public function __construct($type, $data = '')
+    {
+        $this->type = $type;
+        $this->data = $data;
+    }
+
+    public static function open($payload)
+    {
+        return new static(self::OPEN, $payload);
+    }
+
+    public static function pong($payload = '')
+    {
+        return new static(self::PONG, $payload);
+    }
+
+    public static function ping()
+    {
+        return new static(self::PING);
+    }
+
+    public static function message($payload)
+    {
+        return new static(self::MESSAGE, $payload);
+    }
+
+    public static function fromString(string $packet)
+    {
+        return new static($packet{0}, substr($packet, 1) ?? '');
+    }
+
+    public function toString()
+    {
+        return $this->type . $this->data;
+    }
+}