up

easy-swoole · Jul 29, 2018 · d9ea05d · d9ea05d
1 parent e89364a
commit d9ea05d
Show file tree

Hide file tree

Showing 17 changed files with 711 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -16,9 +16,9 @@
         "ext-swoole": ">=4.0.3",
         "easyswoole/component": "^1.0",
         "easyswoole/spl": "^1.0",
-        "easyswoole/core": "^1.0",
         "easyswoole/http": "^1.0",
-        "easyswoole/utility": "^1.0"
+        "easyswoole/utility": "^1.0",
+        "jeremeamia/SuperClosure": "^2.4"
     },
     "require-dev": {
         "easyswoole/swoole-ide-helper": "dev-master"

diff --git a/src/AbstractInterface/Event.php b/src/AbstractInterface/Event.php
@@ -9,7 +9,7 @@
 namespace EasySwoole\EasySwoole\AbstractInterface;
 
 
-use EasySwoole\Core\EventRegister;
+use EasySwoole\EasySwoole\Swoole\EventRegister;
 use EasySwoole\Http\Request;
 use EasySwoole\Http\Response;
 

diff --git a/src/Core.php b/src/Core.php
@@ -11,10 +11,9 @@
 
 use EasySwoole\Component\Di;
 use EasySwoole\Component\Singleton;
-use EasySwoole\Core\EventHelper;
-use EasySwoole\Core\EventRegister;
-use EasySwoole\Core\ServerManager;
 use EasySwoole\EasySwoole\AbstractInterface\Event;
+use EasySwoole\EasySwoole\Swoole\EventHelper;
+use EasySwoole\EasySwoole\Swoole\EventRegister;
 use EasySwoole\Http\Request;
 use EasySwoole\Http\Response;
 use EasySwoole\Http\WebService;

diff --git a/src/Resource/Config.tpl b/src/Resource/Config.tpl
@@ -4,7 +4,7 @@ return [
     'MAIN_SERVER'=>[
         'HOST'=>'0.0.0.0',
         'PORT'=>9501,
-        'SERVER_TYPE'=>\EasySwoole\Core\ServerManager::TYPE_WEB_SERVER,
+        'SERVER_TYPE'=>\EasySwoole\EasySwoole\ServerManager::TYPE_WEB_SERVER,
         'SOCK_TYPE'=>SWOOLE_TCP,//该配置项当为SERVER_TYPE值为TYPE_SERVER时有效
         'RUN_MODEL'=>SWOOLE_PROCESS,
         'SETTING'=>[

diff --git a/src/Resource/EasySwooleEvent.tpl b/src/Resource/EasySwooleEvent.tpl
@@ -9,7 +9,7 @@
 namespace EasySwoole\EasySwoole;
 
 
-use EasySwoole\Core\EventRegister;
+use EasySwoole\EasySwoole\Swoole\EventRegister;
 use EasySwoole\EasySwoole\AbstractInterface\Event;
 use EasySwoole\Http\Request;
 use EasySwoole\Http\Response;

diff --git a/src/ServerManager.php b/src/ServerManager.php
@@ -0,0 +1,210 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: yf
+ * Date: 2018/7/28
+ * Time: 下午5:36
+ */
+
+namespace EasySwoole\EasySwoole;
+
+
+use EasySwoole\Component\Singleton;
+use EasySwoole\EasySwoole\Swoole\EventHelper;
+use EasySwoole\EasySwoole\Swoole\EventRegister;
+use EasySwoole\EasySwoole\Swoole\PipeMessage\Message;
+use EasySwoole\EasySwoole\Swoole\PipeMessage\OnCommand;
+use EasySwoole\EasySwoole\Swoole\Task\AbstractAsyncTask;
+use EasySwoole\EasySwoole\Swoole\Task\SuperClosure;
+use EasySwoole\Trigger\Trigger;
+
+class ServerManager
+{
+    use Singleton;
+
+    private $swooleServer;
+    private $mainServerEventRegister;
+
+    private $subServer = [];
+    private $subServerRegister = [];
+
+    const TYPE_SERVER = 'server';
+    const TYPE_WEB_SERVER = 'web_server';
+    const TYPE_WEB_SOCKET_SERVER = 'ws_server';
+
+
+    function __construct()
+    {
+        $this->mainServerEventRegister = new EventRegister();
+    }
+    /**
+     * @param string $serverName
+     * @return null|\swoole_server|\swoole_server_port
+     */
+    function getSwooleServer(string $serverName = null)
+    {
+        if($serverName === null){
+            return $this->swooleServer;
+        }else{
+            if(isset($this->swooleServer[$serverName])){
+                return $this->swooleServer[$serverName];
+            }
+            return null;
+        }
+    }
+
+    function createSwooleServer($port,$type = self::TYPE_SERVER,$address = '0.0.0.0',array $setting = [],...$args):bool
+    {
+        switch ($type){
+            case self::TYPE_SERVER:{
+                $this->swooleServer = new \swoole_server($address,$port,...$args);
+                break;
+            }
+            case self::TYPE_WEB_SERVER:{
+                $this->swooleServer = new \swoole_http_server($address,$port,...$args);
+                break;
+            }
+            case self::TYPE_WEB_SOCKET_SERVER:{
+                $this->swooleServer = new \swoole_websocket_server($address,$port,...$args);
+                break;
+            }
+            default:{
+                Trigger::error('"unknown server type :{$type}"');
+                return false;
+            }
+        }
+        if($this->swooleServer){
+            $this->swooleServer->set($setting);
+        }
+        $this->registerDefault($this->swooleServer);
+        return true;
+    }
+
+
+    public function addServer(string $serverName,int $port,int $type = SWOOLE_TCP,string $host = '0.0.0.0',array $setting = [
+        "open_eof_check"=>false,
+    ]):EventRegister
+    {
+        $eventRegister = new EventRegister();
+        $this->subServerRegister[$serverName] = [
+            'port'=>$port,
+            'host'=>$host,
+            'type'=>$type,
+            'setting'=>$setting,
+            'eventRegister'=>$eventRegister
+        ];
+        return $eventRegister;
+    }
+
+    function getMainEventRegister():EventRegister
+    {
+        return $this->mainServerEventRegister;
+    }
+
+    function start()
+    {
+        $events = $this->getMainEventRegister()->all();
+        foreach ($events as $event => $callback){
+            $this->getSwooleServer()->on($event, function (...$args) use ($callback) {
+                foreach ($callback as $item) {
+                    call_user_func($item,...$args);
+                }
+            });
+        }
+        $this->attachListener();
+        $this->getSwooleServer()->start();
+    }
+
+    private function attachListener():void
+    {
+        foreach ($this->subServerRegister as $serverName => $server){
+            $subPort = $this->getSwooleServer()->addlistener($server['host'],$server['port'],$server['type']);
+            if($subPort){
+                $this->subServer[$serverName] = $subPort;
+                if(is_array($server['setting'])){
+                    $subPort->set($server['setting']);
+                }
+                $events = $server['eventRegister']->all();
+                foreach ($events as $event => $callback){
+                    $subPort->on($event, function (...$args) use ($callback) {
+                        foreach ($callback as $item) {
+                            call_user_func($item,...$args);
+                        }
+                    });
+                }
+            }else{
+                Trigger::throwable(new \Exception("addListener with server name:{$serverName} at host:{$server['host']} port:{$server['port']} fail"));
+            }
+        }
+    }
+
+
+    private function registerDefault(\swoole_server $server)
+    {
+        //注册默认的on task,finish  不经过 event register。因为on task需要返回值。不建议重写onTask,否则es自带的异步任务事件失效
+        EventHelper::on($server,EventRegister::onTask,function (\swoole_server $server, $taskId, $fromWorkerId,$taskObj){
+            if(is_string($taskObj) && class_exists($taskObj)){
+                $taskObj = new $taskObj;
+            }
+            if($taskObj instanceof AbstractAsyncTask){
+                try{
+                    $ret =  $taskObj->run($taskObj->getData(),$taskId,$fromWorkerId);
+                    //在有return或者设置了结果的时候  说明需要执行结束回调
+                    $ret = is_null($ret) ? $taskObj->getResult() : $ret;
+                    if(!is_null($ret)){
+                        $taskObj->setResult($ret);
+                        return $taskObj;
+                    }
+                }catch (\Throwable $throwable){
+                    $taskObj->onException($throwable);
+                }
+            }else if($taskObj instanceof SuperClosure){
+                try{
+                    return $taskObj( $server, $taskId, $fromWorkerId);
+                }catch (\Throwable $throwable){
+                    Trigger::throwable($throwable);
+                }
+            }
+            return null;
+        });
+        EventHelper::on($server,EventRegister::onFinish,function (\swoole_server $server, $taskId, $taskObj){
+            //finish 在仅仅对AbstractAsyncTask做处理，其余处理无意义。
+            if($taskObj instanceof AbstractAsyncTask){
+                try{
+                    $taskObj->finish($taskObj->getResult(),$taskId);
+                }catch (\Throwable $throwable){
+                    $taskObj->onException($throwable);
+                }
+            }
+        });
+
+        //注册默认的pipe通讯
+        OnCommand::getInstance()->set('TASK',function ($fromId,$taskObj){
+            if(is_string($taskObj) && class_exists($taskObj)){
+                $taskObj = new $taskObj;
+            }
+            if($taskObj instanceof AbstractAsyncTask){
+                try{
+                    $taskObj->run($taskObj->getData(),ServerManager::getInstance()->getSwooleServer()->worker_id,$fromId);
+                }catch (\Throwable $throwable){
+                    $taskObj->onException($throwable);
+                }
+            }else if($taskObj instanceof SuperClosure){
+                try{
+                    $taskObj();
+                }catch (\Throwable $throwable){
+                    Trigger::throwable($throwable);
+                }
+            }
+        });
+
+        EventHelper::on($server,EventRegister::onPipeMessage,function (\swoole_server $server,$fromWorkerId,$data){
+            $message = \swoole_serialize::unpack($data);
+            if($message instanceof Message){
+                OnCommand::getInstance()->hook($message->getCommand(),$fromWorkerId,$message->getData());
+            }else{
+                Trigger::error("data :{$data} not packet by swoole_serialize or not a Message Instance");
+            }
+        });
+    }
+}
diff --git a/src/Swoole/EventHelper.php b/src/Swoole/EventHelper.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: yf
+ * Date: 2018/7/28
+ * Time: 下午5:38
+ */
+
+namespace EasySwoole\EasySwoole\Swoole;
+
+
+class EventHelper
+{
+    public static function register(EventRegister $register,string $event,callable $callback):void
+    {
+        $register->set($event,$callback);
+    }
+
+    public static function registerWithAdd(EventRegister $register,string $event,callable $callback):void
+    {
+        $register->add($event,$callback);
+    }
+
+    public static function on(\swoole_server $server,string $event,callable $callback)
+    {
+        $server->on($event,$callback);
+    }
+}
diff --git a/src/Swoole/EventRegister.php b/src/Swoole/EventRegister.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: yf
+ * Date: 2018/7/28
+ * Time: 下午5:37
+ */
+
+namespace EasySwoole\EasySwoole\Swoole;
+
+
+use EasySwoole\Component\MultiContainer;
+
+class EventRegister extends MultiContainer
+{
+    const onStart = 'start';
+    const onShutdown = 'shutdown';
+    const onWorkerStart = 'workerStart';
+    const onWorkerStop = 'workerStop';
+    const onWorkerExit = 'workerExit';
+    const onTimer = 'timer';
+    const onConnect = 'connect';
+    const onReceive = 'receive';
+    const onPacket = 'packet';
+    const onClose = 'close';
+    const onBufferFull = 'bufferFull';
+    const onBufferEmpty = 'bufferEmpty';
+    const onTask = 'task';
+    const onFinish = 'finish';
+    const onPipeMessage = 'pipeMessage';
+    const onWorkerError = 'workerError';
+    const onManagerStart = 'managerStart';
+    const onManagerStop = 'managerStop';
+    const onRequest = 'request';
+    const onHandShake = 'handShake';
+    const onMessage = 'message';
+    const onOpen = 'open';
+
+    function __construct(array $allowKeys = null)
+    {
+        parent::__construct([
+            'start','shutdown','workerStart','workerStop','workerExit','timer',
+            'connect','receive','packet','close','bufferFull','bufferEmpty','task',
+            'finish','pipeMessage','workerError','managerStart','managerStop',
+            'request','handShake','message','open'
+        ]);
+    }
+}