脱离框架

Author: xiaochengfu

src/Logger.php

@@ -7,8 +7,17 @@
 namespace xiaochengfu\swoole;
 
 
-class Logger extends SwooleBase
+class Logger
 {
+    /**
+     * 配置对象
+     * @var array
+     */
+    private $settings = [];
+
+    function __construct($settings){
+        $this->settings = $settings;
+    }
 
     public  function info($msg,$logfile='') {
         $settings = $this->settings;

src/Swoole.php

@@ -7,33 +7,41 @@
 namespace xiaochengfu\swoole;
 use Curl\Curl;
 
-class Swoole extends SwooleBase
+class Swoole
 {
 
-    const NORMAL = 1;
-    const TYPE_SOCKET = 'socket';//socket请求
+    /**
+     * 配置对象
+     * @var array
+     */
+    private $settings = [];
+
+    function __construct($settings){
+        $this->settings = $settings;
+    }
 
     /**
+     * Description:  主动推送
+     * Author: hp <xcf-hp@foxmail.com>
      * @param $fd
-     * @param $data
-     * @return mixed
-     * websocket消息推送
-     * 格式为:
-     *   'fd' => xx,//客户端id
-     *   'data' => [],//消息体
+     * @param array $data
+     * @return bool
+     * @throws \ErrorException
      */
-    public function pushMsg($fd,$data){
-		$t1 = microtime(true);
-        (new Logger())->info('[ 消息发送触发开始 '.date('Y-m-d H:i:s' ,time()).']-data为'.json_encode($data));
+    public function pushMsg($fd,array $data){
         $settings = $this->settings;
-        $datas['type'] = self::TYPE_SOCKET;
-        $datas['data'] = json_encode($data);
-        $datas['fd'] = $fd;
+        $t1 = microtime(true);
+        $logger = new Logger($settings);
+        $logger->info('[ 消息发送触发开始 '.date('Y-m-d H:i:s' ,time()).']-data为'.json_encode($data));
         $curl = new Curl();
-		$datas['command'] = $data['command'];
-        $curl->post($settings['swoole_http'],$datas);
+        $body = [
+            'fd'=>$fd,
+            'data'=>$data,
+            'type'=>'socket'
+        ];
+        $curl->post($settings['swoole_http'],$body);
 		$t2 = microtime(true);
-        (new Logger())->info('[ 消息发送触发结束 '.date('Y-m-d H:i:s', time()).']-执行耗时：'.round($t2-$t1, 3));
+        $logger->info('[ 消息发送触发结束 '.date('Y-m-d H:i:s', time()).']-执行耗时：'.round($t2-$t1, 3));
 		return true;
     }
 

src/SwooleBase.php

@@ -14,16 +14,10 @@ class SwooleService{
      */
     private $settings = [];
 
-    /**
-     * 框架全局对象
-     * @var null
-     */
-    private $app = null;
 
-    function __construct($settings,$app){
+    function __construct($settings){
         $this->settings = $settings;
         $this->check();
-        $this->app = $app;
     }
 
     /**
@@ -47,8 +41,8 @@ private function check(){
         * 检查命令 lsof 命令是否存在
         */
         exec("whereis lsof", $out);
-        if (strpos($out[0], "/usr/sbin/lsof") === false ) {
-            exit('error:找不到lsof命令,请确保lsof在/usr/sbin下' . PHP_EOL);
+        if (strpos($out[0], "lsof") === false ) {
+            exit('error:找不到lsof命令' . PHP_EOL);
         }
 		/**
         * 检查目录是否存在并赋予权限
@@ -66,7 +60,7 @@ private function check(){
      */
     private function bindPort($port) {
         $res = [];
-        $cmd = "/usr/sbin/lsof -i :{$port}|awk '$1 != \"COMMAND\"  {print $1, $2, $9}'";
+        $cmd = "lsof -i :{$port}|awk '$1 != \"COMMAND\"  {print $1, $2, $9}'";
         //eg:  php 7935 localhost:9512
         exec($cmd, $out);
         if ($out) {
@@ -119,7 +113,7 @@ public function serviceStart(){
         }
 
         //启动
-        $server = new SwooleSetWebSocket($this->settings,$this->app);
+        $server = new SwooleSetWebSocket($this->settings);
         $server->run();
 
     }

src/SwooleService.php

@@ -17,20 +17,13 @@ class SwooleSetWebSocket{
      */
     private $settings = [];
 
-    /**
-     * 框架全局 对象
-     * @var array
-     */
-    private $app = null;
 
     /**
      * SwooleSetWebSocket constructor.
      * @param $settings
-     * @param $app
      */
-    public function __construct($settings,$app){
+    public function __construct($settings){
         $this->settings = $settings;
-        $this->app = $app;
     }
 
     /**
@@ -192,20 +185,23 @@ public function onRequest($request, $response){
                         $status = $this->server->connection_info($requestData['fd']);
                         if($status['websocket_status'] == WEBSOCKET_STATUS_FRAME){
 							$t1 = microtime(true);
-							(new Logger())->info('[ 消息发送开始 '.date('Y-m-d H:i:s', time()).']-id为'.$requestData['fd']);
-                            $result = $this->server->push($requestData['fd'],$requestData['data']);
+							$logger = new Logger($this->settings);
+							$logger->info('[ 消息发送开始 '.date('Y-m-d H:i:s', time()).']-id为'.$requestData['fd']);
+                            $result = $this->server->push($requestData['fd'],json_encode($requestData['data']));
                             echo $result. PHP_EOL;
-                            echo time(). PHP_EOL;
                             echo date('Y-m-d H:i:s'). PHP_EOL;
 							$t2 = microtime(true);
-							(new Logger())->info('[ 消息发送结束 '.date('Y-m-d H:i:s', time()).']-id为'.$requestData['fd'].' 执行耗时：'.round($t2-$t1, 3));
-                        } else
-							$this->onClose($this->server, $requestData['fd']);
+							$logger->info('[ 消息发送结束 '.date('Y-m-d H:i:s', time()).']-id为'.$requestData['fd'].' 执行耗时：'.round($t2-$t1, 3));
+                            $response->end('success');
+                        } else{
+                            $this->onClose($this->server, $requestData['fd']);
+                        }
                     }
                 }
             }
+        }else{
+            $response->end(json_encode($this->server->stats()));
         }
-        $response->end(json_encode($this->server->stats()));
     }
 
 
@@ -236,7 +232,7 @@ private function parseData($data){
      */
     public function onTask($serv, $task_id, $src_worker_id, $data){
         //$task_id和$src_worker_id组合起来才是全局唯一的
-        (new Logger())->info('[task data] '.$data);
+        (new Logger($this->settings))->info('[task data] '.$data);
         $data = $this->parseData($data);
         if($data === false){
             return false;