update timer and add unix server abstract

examples/timer/timer.php

@@ -18,7 +18,7 @@ class DemoTimer extends \FastD\Swoole\Timer
      * @param array $params
      * @return mixed
      */
-    public function doTick($id, array $params = [])
+    public function handle($id, array $params = [])
     {
         echo ++$this->count;
         if (3 === $this->count) {

examples/websocket/websocket.php

@@ -28,8 +28,9 @@ public function doOpen(swoole_websocket_server $server, swoole_http_request $req
      */
     public function doMessage(swoole_server $server, swoole_websocket_frame $frame)
     {
+        echo $this->getFileDescriptor() . PHP_EOL;
+        echo $frame->fd;
         echo "receive from {$frame->fd}:{$frame->data},opcode:{$frame->opcode},fin:{$frame->finish}\n";
-        $server->push($frame->fd, "this is server");
     }
 }
 

src/Server.php

@@ -10,7 +10,6 @@
 namespace FastD\Swoole;
 
 use Exception;
-use Psr\Http\Message\ResponseInterface;
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Output\ConsoleOutput as Output;
 use FastD\Swoole\Support\Watcher;
@@ -27,7 +26,7 @@
  */
 abstract class Server
 {
-    const VERSION = '2.0.0 (dev)';
+    const VERSION = '2.0.0';
 
     /**
      * @var $name
@@ -101,12 +100,7 @@ abstract class Server
     /**
      * @var int
      */
-    public $from_fd;
-
-    /**
-     * @var int
-     */
-    public $to_fd;
+    protected $fd;
 
     /**
      * Server constructor.
@@ -201,6 +195,14 @@ public function getPort()
         return $this->port;
     }
 
+    /**
+     * @return int
+     */
+    public function getFileDescriptor()
+    {
+        return $this->fd;
+    }
+
     /**
      * @return string
      */
@@ -664,7 +666,7 @@ abstract public function doFinish(swoole_server $server, $data, $taskId);
      */
     public function onConnect(swoole_server $server, $fd, $from_id)
     {
-        $this->from_fd = $fd;
+        $this->fd = $fd;
 
         $this->doConnect($server, $fd, $from_id);
     }

src/Server/Unix.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * @author    jan huang <[email protected]>
+ * @copyright 2017
+ *
+ * @see      https://www.github.com/janhuang
+ * @see      http://www.fast-d.cn/
+ */
+
+namespace FastD\Swoole\Server;
+
+
+use FastD\Swoole\Server;
+
+abstract class Unix extends Server
+{
+
+}

src/Timer.php

@@ -72,7 +72,7 @@ public function withServer(Server $server)
      */
     public function tick()
     {
-        $this->id = timer_tick($this->ms, [$this, 'doTick'], $this->params);
+        $this->id = timer_tick($this->ms, [$this, 'handle'], $this->params);
 
         return $this->id;
     }
@@ -82,7 +82,7 @@ public function tick()
      */
     public function after()
     {
-        $this->id = timer_after($this->ms, [$this, 'doTick'], $this->params);
+        $this->id = timer_after($this->ms, [$this, 'handle'], $this->params);
 
         return $this->id;
     }
@@ -100,5 +100,5 @@ public function clear()
      * @param array $params
      * @return mixed
      */
-    abstract public function doTick($id, array $params = []);
+    abstract public function handle($id, array $params = []);
 }