This commit is contained in:
2020-09-04 01:22:26 +08:00
parent e29f67fa4e
commit afdd0b8030
+8 -8
View File
@@ -13,7 +13,7 @@ use HttpServer\Route\Annotation\Tcp;
use HttpServer\Service\Http; use HttpServer\Service\Http;
use HttpServer\Service\Receive; use HttpServer\Service\Receive;
use HttpServer\Service\Packet; use HttpServer\Service\Packet;
use HttpServer\Service\WebSocket; use HttpServer\Service\Websocket;
use Exception; use Exception;
use ReflectionException; use ReflectionException;
use Snowflake\Abstracts\Config; use Snowflake\Abstracts\Config;
@@ -51,17 +51,17 @@ class Server extends Application
'HTTP' => [SWOOLE_TCP, Http::class], 'HTTP' => [SWOOLE_TCP, Http::class],
'TCP' => [SWOOLE_TCP, Receive::class], 'TCP' => [SWOOLE_TCP, Receive::class],
'PACKAGE' => [SWOOLE_UDP, Packet::class], 'PACKAGE' => [SWOOLE_UDP, Packet::class],
'WEBSOCKET' => [SWOOLE_SOCK_TCP, WebSocket::class], 'WEBSOCKET' => [SWOOLE_SOCK_TCP, Websocket::class],
]; ];
/** @var Http|WebSocket|Packet|Receive */ /** @var Http|Websocket|Packet|Receive */
private $baseServer; private $baseServer;
/** /**
* @param array $configs * @param array $configs
* @return Http|Packet|Receive|WebSocket * @return Http|Packet|Receive|Websocket
* @throws Exception * @throws Exception
*/ */
public function initCore(array $configs) public function initCore(array $configs)
@@ -149,7 +149,7 @@ class Server extends Application
/** /**
* @return Http|WebSocket|Packet|Receive * @return Http|Websocket|Packet|Receive
*/ */
public function getServer() public function getServer()
{ {
@@ -220,7 +220,7 @@ class Server extends Application
*/ */
private function bindAnnotation() private function bindAnnotation()
{ {
if ($this->baseServer instanceof WebSocket) { if ($this->baseServer instanceof Websocket) {
$this->onLoadWebsocketHandler(); $this->onLoadWebsocketHandler();
} }
if ($this->baseServer instanceof Http) { if ($this->baseServer instanceof Http) {
@@ -247,7 +247,7 @@ class Server extends Application
$this->onBind($newListener, 'packet', [Snowflake::createObject(OnPacket::class), 'onHandler']); $this->onBind($newListener, 'packet', [Snowflake::createObject(OnPacket::class), 'onHandler']);
$this->onBind($newListener, 'receive', [Snowflake::createObject(OnReceive::class), 'onHandler']); $this->onBind($newListener, 'receive', [Snowflake::createObject(OnReceive::class), 'onHandler']);
} else if ($config['type'] == self::WEBSOCKET) { } else if ($config['type'] == self::WEBSOCKET) {
throw new Exception('Base server must instanceof \Swoole\WebSocket\Server::class.'); throw new Exception('Base server must instanceof \Swoole\Websocket\Server::class.');
} else { } else {
throw new Exception('Unknown server type(' . $config['type'] . ').'); throw new Exception('Unknown server type(' . $config['type'] . ').');
} }
@@ -314,7 +314,7 @@ class Server extends Application
{ {
$default = [ $default = [
self::HTTP => Http::class, self::HTTP => Http::class,
self::WEBSOCKET => WebSocket::class, self::WEBSOCKET => Websocket::class,
self::TCP => Receive::class, self::TCP => Receive::class,
self::PACKAGE => Packet::class self::PACKAGE => Packet::class
]; ];