优化rpc,udp,websocket的数据获取

bingcool · Jun 11, 2018 · c377add · c377add
1 parent ef6aa6b
commit c377add
Show file tree

Hide file tree

Showing 3 changed files with 92 additions and 23 deletions.
diff --git a/score/Core/SController.php b/score/Core/SController.php
@@ -16,6 +16,7 @@
 use Swoolefy\Core\Hook;
 use Swoolefy\Core\Application;
 use Swoolefy\Core\BaseServer;
+use Swoolefy\Tcp\TcpServer;
 
 class SController extends Object {
 
@@ -37,6 +38,12 @@ class SController extends Object {
 	 */
 	public $fd = null;
 
+	/**
+	 * $mixed_params 
+	 * @var 
+	 */
+	public $mixed_params;
+
 	/**
 	 * __construct
 	 */
@@ -135,47 +142,31 @@ public function isClientPackLength() {
 	 * @return   array
 	 */
 	public function getRpcPackHeader() {
-		if(BaseServer::getServiceProtocol() == SWOOLEFY_TCP) {
-			return $this->rpc_pack_header;
-		}else {
-			throw new \Exception("this method only can be called by TCP or RPC server!, because only rpc have pack setting!");
-		}
+		return Application::$app->getRpcPackHeader();
 	}
 
 	/**
 	 * getRpcPackBodyParams 获取rpc的包体数据
 	 * @return mixed
 	 */
 	public function getRpcPackBodyParams() {
-		if(BaseServer::getServiceProtocol() == SWOOLEFY_TCP) {
-			return $this->mixed_params;
-		}else {
-			throw new \Exception("this method only can be called by TCP or RPC server!, because only rpc have pack setting!");
-		}
+		return Application::$app->getRpcPackBodyParams();
 	}
 
 	/**
 	 * getUdpData 获取udp的数据
 	 * @return mixed
 	 */
 	public function getUdpData() {
-		if(BaseServer::getServiceProtocol() == SWOOLEFY_UDP) {
-			return $this->mixed_params;
-		}else {
-			throw new \Exception("this method only can be called by UDP server!");
-		}
+		return Application::$app->getUdpData();
 	}
 
 	/**
-	 * getWebsockMsg 获取udp的参数
+	 * getWebsockMsg 获取websocket的信息
 	 * @return mixed
 	 */
 	public function getWebsockMsg() {
-		if(BaseServer::getServiceProtocol() == SWOOLEFY_WEBSOCKET) {
-			return $this->mixed_params;
-		}else {
-			throw new \Exception("this method only can be called by WEBSOCKET server!");
-		}
+		return Application::$app->getWebsockMsg();
 	}
 
 	/**

diff --git a/score/Core/ServiceDispatch.php b/score/Core/ServiceDispatch.php
@@ -13,6 +13,7 @@
 
 use Swoolefy\Core\Swfy;
 use Swoolefy\Core\AppDispatch;
+use Swoolefy\Core\Application;
 
 class ServiceDispatch extends AppDispatch {
 	/**
@@ -41,7 +42,8 @@ public function __construct($callable, $params, $rpc_pack_header = []) {
 		parent::__construct();
 		$this->callable = $callable;
 		$this->params = $params;
-		$this->rpc_pack_header = $rpc_pack_header;
+		Application::$app->mixed_params = $params;
+		Application::$app->rpc_pack_header = $rpc_pack_header;
 	}
 
 	/**
@@ -62,10 +64,11 @@ public function dispatch() {
 
 		$class = str_replace('/','\\', $class);
 		$serviceInstance = new $class();
-		$serviceInstance->rpc_pack_header = $this->rpc_pack_header;
 		$serviceInstance->mixed_params = $this->params;
 		try{
 			$serviceInstance->$action($this->params);
+		}catch(\Exception $e) {
+			throw new \Exception($e->getMessage());
 		}catch(\Exception $e) {
 			throw new \Exception("when dispatch, create $class Instance Fatal error, $class is not exist or $action is not exist!", 1);
 		}

diff --git a/score/Core/Swoole.php b/score/Core/Swoole.php
@@ -27,6 +27,17 @@ class Swoole extends Object {
 	 */
 	public $fd = null;
 
+	/**
+	 * $mixed_params rpc,udp,websocket传递的参数寄存属性
+	 */
+	public $mixed_params;
+
+	/**
+	 * $rpc_pack_header rpc的包头数据
+	 * @var array
+	 */
+	public $rpc_pack_header = [];
+
 	/**
  	 * $ExceptionHanderClass 异常处理类
  	 * @var string
@@ -104,6 +115,70 @@ public static function isTaskProcess() {
         return (!self::isWorkerProcess()) ? true : false;
     }
 
+    /**
+	 * getRpcPackHeader  获取rpc的pack头信息,只适用于rpc服务
+	 * @return   array
+	 */
+	public function getRpcPackHeader() {
+		if($this->isWorkerProcess()) {
+			if(BaseServer::getServiceProtocol() == SWOOLEFY_TCP) {
+				return $this->rpc_pack_header;
+			}else {
+				throw new \Exception("this method only can be called by TCP or RPC server!, because only rpc have pack setting!");
+			}
+		}else {
+			throw new \Exception("getRpcPackHeader() only can use in worker process!", 1);
+		}
+	}
+
+    /**
+	 * getRpcPackBodyParams 获取rpc的包体数据
+	 * @return mixed
+	 */
+	public function getRpcPackBodyParams() {
+		if($this->isWorkerProcess()) {
+			if(BaseServer::getServiceProtocol() == SWOOLEFY_TCP) {
+				return $this->mixed_params;
+			}else {
+				throw new \Exception("this method only can be called by TCP or RPC server!, because only rpc have pack setting!");
+			}
+		}else {
+			throw new \Exception("getRpcPackBodyParams() only can use in worker process!", 1);
+		}
+	}
+
+	/**
+	 * getUdpData 获取udp的数据
+	 * @return mixed
+	 */
+	public function getUdpData() {
+		if($this->isWorkerProcess()) {
+			if(BaseServer::getServiceProtocol() == SWOOLEFY_UDP) {
+				return $this->mixed_params;
+			}else {
+				throw new \Exception("this method only can be called by UDP server!");
+			}
+		}else {
+			throw new \Exception("getUdpData() only can use in worker process!", 1);
+		}
+	}
+
+	/**
+	 * getWebsockMsg 获取websocket的信息
+	 * @return mixed
+	 */
+	public function getWebsockMsg() {
+		if($this->isWorkerProcess()) {
+			if(BaseServer::getServiceProtocol() == SWOOLEFY_WEBSOCKET) {
+				return $this->mixed_params;
+			}else {
+				throw new \Exception("this method only can be called by WEBSOCKET server!");
+			}	
+		}else {
+			throw new \Exception("getWebsockMsg() only can use in worker process!", 1);
+		}
+	}
+
  	/**
 	 * afterRequest 请求结束后注册钩子执行操作
 	 * @param	mixed   $callback