监听http✅

Author: flxxyz

README.md

@@ -1,6 +1,12 @@
 # swoole websocket and tcp and udp
 
+## 介绍
+
+
+## 
+
 ## 任务
 - [x] 监听websocket
+- [x] 监听http
 - [ ] 监听tcp
 - [ ] 监听udp

example.php

@@ -15,16 +15,18 @@
             'open_websocket_protocol' => true,
             'task_worker_num'         => 1,
         ],
-        'handler' => swoole_websocket_and_tcp_and_udp_test\webscoket::class,
+        'handler' => \swoole_websocket_and_tcp_and_udp_test\webscoket::class,
     ],
     'http'                => [
         'enable'  => true,
         'host'    => '0.0.0.0',
         'port'    => '9001',
         'type'    => SWOOLE_SOCK_TCP,
         'setting' => [
-            'open_websocket_protocol' => true,
+            'open_http_protocol' => true,
+            'daemonize'          => false,
         ],
+        'handler' => \swoole_websocket_and_tcp_and_udp_test\http::class,
     ],
     'tcp'                 => [
         'enable'  => true,

src/Server.php

@@ -5,6 +5,8 @@
 
 use swoole_websocket_and_tcp_and_udp\common\Logger;
 use swoole_websocket_and_tcp_and_udp\common\ProcessTrait;
+use swoole_websocket_and_tcp_and_udp\handler\HttpHandler;
+use swoole_websocket_and_tcp_and_udp\handler\WebsocketHandler;
 
 class Server
 {
@@ -23,6 +25,8 @@ class Server
 
     protected $enableWebsocket = false;
 
+    protected $enableTask = false;
+
     public function __construct($config)
     {
         $this->config = $config;
@@ -44,15 +48,19 @@ public function __construct($config)
         $type = $this->primaryConfig['type'];
         $setting = $this->primaryConfig['setting'];
 
+        if (isset($setting['task_worker_num'])) {
+            $this->enableTask = true;
+        }
+
         Logger::info("开始监听端口 {$host}:{$port}");
         $this->server = new $serverClass($host, $port, SWOOLE_PROCESS, $type);
         $this->server->set($setting);
 
 
         $this->bindBaseEvent();
-        $this->bindHttpEvent();
         $this->bindTaskEvent();
-        $this->bindWebsocketEvent();
+        $this->bindMasterEvent();
+        $this->bindOtherEvent();
     }
 
     /**
@@ -72,34 +80,19 @@ protected function bindBaseEvent()
         $this->server->on('PipeMessage', [$this, 'PipeMessage']);
     }
 
-    protected function bindHttpEvent()
-    {
-        $this->server->on('Request', [$this, 'request']);
-    }
-
     protected function bindTaskEvent()
     {
         $this->server->on('Task', [$this, 'task']);
         $this->server->on('Finish', [$this, 'finish']);
     }
 
-    protected function bindWebsocketEvent()
+    protected function bindMasterEvent()
     {
-        if ($this->enableWebsocket) {
-            $handlerClass = $this->primaryConfig['handler'];
-            $handler = new $handlerClass();
-            if (!($handler instanceof protocol\WebsocketEvent)) {
-                throw new \Exception(sprintf('%s 当前类不属于 %s',
-                    $handlerClass, protocol\WebsocketEvent::class));
-            }
+        $handlerClass = $this->primaryConfig['handler'];
 
-            $eventHandler = function ($method, array $params) use ($handler) {
-                try {
-                    call_user_func_array([$handler, $method], $params);
-                } catch (\Exception $e) {
-                    exit($e);
-                }
-            };
+        if ($this->enableWebsocket) {
+            $websocketHandler = new WebsocketHandler($handlerClass);
+            $eventHandler = $websocketHandler->make();
 
             $this->server->on('Open', function () use ($eventHandler) {
                 $eventHandler('open', func_get_args());
@@ -112,9 +105,21 @@ protected function bindWebsocketEvent()
             $this->server->on('Close', function () use ($eventHandler) {
                 $eventHandler('close', func_get_args());
             });
+        } else {
+            $httpHandler = new HttpHandler($handlerClass);
+            $eventHandler = $httpHandler->make();
+
+            $this->server->on('request', function () use ($eventHandler) {
+                $eventHandler('request', func_get_args());
+            });
         }
     }
 
+    protected function bindOtherEvent()
+    {
+
+    }
+
     public function start(\swoole_http_server $server)
     {
         foreach (spl_autoload_functions() as $function) {
@@ -154,8 +159,10 @@ public function WorkerStart(\swoole_http_server $server, $worker_id)
         $this->setProcessName(sprintf('%s process %d', $process,
             $worker_id));
 
-        if (!$server->taskworker) {
-            $server->task(1);
+        if ($this->enableTask) {
+            if (!$server->taskworker) {
+                $server->task(1);
+            }
         }
     }
 
@@ -208,13 +215,6 @@ public function finish(\swoole_http_server $server, $task_id, $data)
 
     }
 
-    public function request(
-        \swoole_http_request $request,
-        \swoole_http_response $response
-    ) {
-
-    }
-
     public function run()
     {
         Logger::info('运行服务...');

src/handler/Handler.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace swoole_websocket_and_tcp_and_udp\handler;
+
+
+use swoole_websocket_and_tcp_and_udp\protocol\HttpEvent;
+use swoole_websocket_and_tcp_and_udp\protocol\WebsocketEvent;
+
+abstract class Handler
+{
+    protected function make()
+    {
+    }
+
+    /**
+     * @param WebsocketEvent | HttpEvent $handler
+     *
+     * @return \Closure
+     */
+    protected function eventCallbak($handler)
+    {
+        return function ($method, $params) use ($handler) {
+            try {
+                call_user_func_array([$handler, $method], $params);
+            } catch (\Exception $e) {
+                exit($e);
+            }
+        };
+    }
+}

src/handler/HttpHandler.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace swoole_websocket_and_tcp_and_udp\handler;
+
+
+use swoole_websocket_and_tcp_and_udp\protocol\HttpEvent;
+
+class HttpHandler extends Handler
+{
+    public function __construct($handlerClass)
+    {
+        $this->handlerClass = $handlerClass;
+    }
+
+    public function make()
+    {
+        $handler = new $this->handlerClass();
+
+        if (!($handler instanceof HttpEvent)) {
+            throw new \Exception(sprintf('%s 当前类不属于 %s',
+                $this->handlerClass, HttpEvent::class));
+        }
+
+        return $this->eventCallbak($handler);
+    }
+}

src/handler/WebsocketHandler.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace swoole_websocket_and_tcp_and_udp\handler;
+
+
+use swoole_websocket_and_tcp_and_udp\protocol\WebsocketEvent;
+
+class WebsocketHandler extends Handler
+{
+    public function __construct($handlerClass)
+    {
+        $this->handlerClass = $handlerClass;
+    }
+
+    public function make()
+    {
+        $handler = new $this->handlerClass();
+
+        if (!($handler instanceof WebsocketEvent)) {
+            throw new \Exception(sprintf('%s 当前类不属于 %s',
+                $this->handlerClass, WebsocketEvent::class));
+        }
+
+        return $this->eventCallbak($handler);
+    }
+
+}

src/protocol/HttpEvent.php

@@ -25,7 +25,7 @@ public function __construct(\swoole_server_port $port)
     }
 
     public function request(
-        \swoole_http_server $server,
+        \swoole_http_request $request,
         \swoole_http_response $response
     ) {
         // TODO: Implement request() method.

src/protocol/HttpInterface.php

@@ -10,13 +10,13 @@
 interface HttpInterface
 {
     /**
-     * @param \swoole_http_server   $server
+     * @param \swoole_http_request  $request
      * @param \swoole_http_response $response
      *
      * @return mixed
      */
     function request(
-        \swoole_http_server $server,
+        \swoole_http_request $request,
         \swoole_http_response $response
     );
 }

test/http.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace swoole_websocket_and_tcp_and_udp_test;
+
+
+use swoole_websocket_and_tcp_and_udp\common\Logger;
+use swoole_websocket_and_tcp_and_udp\protocol\HttpEvent;
+
+class http extends HttpEvent
+{
+    use Logger;
+
+    public function __construct()
+    {
+    }
+
+    public function request(
+        \swoole_http_request $request,
+        \swoole_http_response $response
+    ) {
+        $response->end('<h1>Dva爱你哟❤️</h1>');
+
+        Logger::info("{$request->server['remote_addr']}:{$request->server['remote_port']}, Request {$request->server['request_uri']} {$request->server['request_method']} {$request->server['server_protocol']} {$request->header['user-agent']}");
+    }
+}