*small fixes

Author: devinterx

server.php

@@ -2,11 +2,16 @@
 
 use mfe\server\libs\http\server\middleware\ApplicationServer;
 use mfe\server\libs\http\server\middleware\StaticServer;
-use mfe\server\libs\http\server\Server;
 use mfe\server\libs\http\server\upgrades\WebSocketServer;
 
+use mfe\server\libs\http\server\StreamServer as Server;
+
 require_once 'vendor/autoload.php';
 
+error_reporting(E_ALL);
+set_time_limit(0);
+ob_implicit_flush();
+
 $server = new Server(HttpServer::build([
     WebSocketServer::class
 ], [

src/api/http/ITcpServer.php

@@ -1,5 +1,6 @@
 <?php namespace mfe\server\api\http;
 use ArrayObject;
+use Thread;
 
 /**
  * Interface ITcpServer
@@ -15,10 +16,9 @@ interface ITcpServer
     static public function build(array $upgrades, array $middleware);
 
     /**
-     * @param string $ip
-     * @param integer $port
+     * @return void
      */
-    public function run($ip, $port);
+    public function run();
 
     /**
      * @param ArrayObject $config

src/libs/http/HttpSocketWriter.php

@@ -43,7 +43,7 @@ public function __construct($socket, IHttpSocketReader $reader)
      */
     public function send($data, $trim = true)
     {
-        if($trim){
+        if ($trim) {
             $data = trim($data);
         }
 

src/libs/http/server/HttpServer.php

@@ -9,14 +9,16 @@
 use mfe\server\libs\http\HttpSocketReader;
 use mfe\server\libs\http\HttpSocketWriter;
 
+require_once dirname(dirname(dirname(dirname(__DIR__)))) . '/vendor/autoload.php';
+
 /**
  * Class HttpServer
  *
  * @package mfe\server\libs\http\server
  */
 class HttpServer implements ITcpServer
 {
-    use TStreamServer;
+    public $enableKeepAlive = false;
 
     /** @var ArrayObject */
     private $config;
@@ -30,10 +32,21 @@ class HttpServer implements ITcpServer
     /** @var IUpgradeServer[] */
     private $upgradedSockets = [];
 
-    public function __construct($upgrades, $middleware)
+    /** @var resource */
+    private $socket;
+
+    /**
+     * @param $socket
+     * @param array $proxy
+     * @param ArrayObject $config
+     */
+    public function __construct($socket, array $proxy, ArrayObject $config)
     {
-        $this->upgrades = $upgrades;
-        $this->middleware = $middleware;
+        $this->socket = $socket;
+        $this->setConfig($config);
+        $this->upgrades = $proxy['upgrades'];
+        $this->middleware = $proxy['middleware'];
+        $this->run();
     }
 
     /**
@@ -44,7 +57,11 @@ public function __construct($upgrades, $middleware)
      */
     static public function build(array $upgrades = [], array $middleware = [])
     {
-        return new static($upgrades, $middleware);
+        return [
+            '_CLASS' => __CLASS__,
+            'upgrades' => $upgrades,
+            'middleware' => $middleware
+        ];
     }
 
     /**
@@ -57,14 +74,9 @@ public function setConfig(ArrayObject $config)
         $this->config = $config;
     }
 
-    public function run($ip, $port)
+    public function run()
     {
-        $this->listenStreamServer($ip, $port);
-        //stream_set_chunk_size($this->server, 1024);
-        //stream_set_blocking($this->server, 1);
-        stream_set_timeout($this->server, 5);
-        $this->acceptSockets();
-        $this->closeStreamServer();
+        $this->handleSocket($this->socket);
     }
 
     /**
@@ -90,7 +102,7 @@ protected function handleSocket($socket)
             $this->keepAliveHandler($socket);
         }
 
-        $this->closeSocket($socket);
+        fclose($socket);
 
         return true;
     }
@@ -108,7 +120,9 @@ protected function pipe($socket, IHttpSocketReader $reader, IHttpSocketWriter $w
             $this->upgradedSockets[(int)$socket] = $upgrade;
         } else {
             if ($reader->isHttpRequest) {
-                $reader->tryKeepAlive();
+                if ($this->enableKeepAlive) {
+                    $reader->tryKeepAlive();
+                }
                 $reader->parseBody();
                 $reader->overrideGlobals();
                 $this->httpRequest($reader, $writer);
@@ -140,7 +154,7 @@ protected function keepAliveHandler($socket)
      *
      * @return void
      */
-    private function httpRequest(IHttpSocketReader $reader, IHttpSocketWriter $writer)
+    protected function httpRequest(IHttpSocketReader $reader, IHttpSocketWriter $writer)
     {
         foreach ($this->middleware as $middleware) {
             $middleware = new $middleware($this->config);
@@ -151,6 +165,6 @@ private function httpRequest(IHttpSocketReader $reader, IHttpSocketWriter $write
             }
         }
 
-        $writer->setHttpStatus(404)->send('Error 404: Not found file by path '. $reader->getUriPath());
+        $writer->setHttpStatus(404)->send('Error 404: Not found file by path ' . $reader->getUriPath());
     }
 }

src/libs/http/server/Server.php

@@ -0,0 +1,57 @@
+<?php namespace mfe\server\libs\http\server;
+
+use ArrayObject;
+use mfe\server\libs\http\server\exceptions\StreamServerException;
+
+/**
+ * Class StreamServer
+ *
+ * @package mfe\server\libs\http\server
+ */
+class StreamServer
+{
+    use TStreamServer;
+
+    /** @var ArrayObject */
+    private $config;
+
+    /** @var array */
+    private $builder;
+
+    /**
+     * @param string $builder
+     * @param array $config
+     */
+    public function __construct($builder, array $config)
+    {
+        $this->config = new ArrayObject($config, ArrayObject::ARRAY_AS_PROPS);
+        $this->builder = $builder;
+    }
+
+    /**
+     * @param $socketBind
+     *
+     * @throws StreamServerException
+     */
+    public function listen($socketBind)
+    {
+        $bindAddress = explode(':', $socketBind);
+        fwrite(STDOUT, "Server started at: http://{$socketBind}/" . PHP_EOL);
+
+        $this->listenStreamServer($bindAddress[0], $bindAddress[1]);
+        stream_set_timeout($this->server, 5);
+        $this->acceptSockets();
+        $this->closeStreamServer();
+    }
+
+    /**
+     * @param resource $socket
+     */
+    protected function handleSocket($socket)
+    {
+        new $this->builder['_CLASS']($socket, [
+            'upgrades' => $this->builder['upgrades'],
+            'middleware' => $this->builder['middleware']
+        ], $this->config);
+    }
+}

src/libs/http/server/StreamServer.php

@@ -50,6 +50,12 @@ protected function closeStreamServer()
     protected function acceptSockets()
     {
         while (true) {
+            foreach ($this->sockets as $socket) {
+                if (get_resource_type($socket) !== 'stream') {
+                    unset($this->sockets[(int)$socket]);
+                }
+            }
+
             $sockets = $this->sockets;
             $sockets[(int)$this->server] = $this->server;
             $write = $except = null;
@@ -89,7 +95,7 @@ protected function handleSocket($socket)
     /**
      * @param resource $socket
      */
-    protected function closeSocket($socket)
+    public function closeSocket($socket)
     {
         unset($this->sockets[(int)$socket]);
         fclose($socket);