modify

HttpServer/Http/CoroutineResponse.php

@@ -0,0 +1,274 @@
+<?php
+
+
+namespace HttpServer\Http;
+
+
+use Exception;
+use HttpServer\Abstracts\HttpService;
+use HttpServer\Http\Formatter\HtmlFormatter;
+use HttpServer\Http\Formatter\JsonFormatter;
+use HttpServer\Http\Formatter\XmlFormatter;
+use HttpServer\IInterface\IFormatter;
+use Snowflake\Core\Help;
+use Snowflake\Snowflake;
+use Swoole\Http\Response as SResponse;
+
+
+/**
+ * Class CoroutineResponse
+ * @package HttpServer\Http
+ */
+class CoroutineResponse extends HttpService
+{
+
+    const JSON = 'json';
+    const XML = 'xml';
+    const HTML = 'html';
+
+    /** @var ?string */
+    public ?string $format = null;
+
+    /** @var int */
+    public int $statusCode = 200;
+
+    public array $headers = [];
+    public array $cookies = [];
+
+    private float $startTime = 0;
+
+    private array $_format_maps = [
+        self::JSON => JsonFormatter::class,
+        self::XML  => XmlFormatter::class,
+        self::HTML => HtmlFormatter::class
+    ];
+
+    public int $fd = 0;
+
+    /**
+     * @param $format
+     * @return $this
+     */
+    public function setFormat($format): static
+    {
+        $this->format = $format;
+        return $this;
+    }
+
+
+    /**
+     * @return string
+     */
+    public function getFormat(): string
+    {
+        if ($this->format == self::HTML) {
+            return 'text/html;charset=utf-8';
+        } else if ($this->format == self::XML) {
+            return 'application/xml;charset=utf-8';
+        } else {
+            return 'application/json;charset=utf-8';
+        }
+    }
+
+
+
+    /**
+     * @param $content
+     * @return string
+     */
+    public function toHtml($content): string
+    {
+        $this->format = self::HTML;
+        return (string)$content;
+    }
+
+
+    /**
+     * @param $content
+     * @return string|bool
+     */
+    public function toJson($content): string|bool
+    {
+        $this->format = self::JSON;
+        return json_encode($content, JSON_UNESCAPED_UNICODE);
+    }
+
+
+    /**
+     * @param $content
+     * @return mixed
+     */
+    public function toXml($content): mixed
+    {
+        $this->format = self::XML;
+        return $content;
+    }
+
+
+    /**
+     * @param $key
+     * @param $value
+     * @return Response
+     */
+    public function addHeader($key, $value): static
+    {
+        $this->headers[$key] = $value;
+        return $this;
+    }
+
+
+    /**
+     * @param $name
+     * @param null $value
+     * @param null $expires
+     * @param null $path
+     * @param null $domain
+     * @param null $secure
+     * @param null $httponly
+     * @param null $samesite
+     * @param null $priority
+     * @return Response
+     */
+    public function addCookie($name, $value = null, $expires = null, $path = null, $domain = null, $secure = null, $httponly = null, $samesite = null, $priority = null): static
+    {
+        $this->cookies[] = func_get_args();
+        return $this;
+    }
+
+
+
+    /**
+     * @param $statusCode
+     */
+    public function setStatusCode($statusCode)
+    {
+        $this->statusCode = $statusCode;
+    }
+
+
+
+    /**
+     * @param mixed $context
+     * @param int $statusCode
+     * @return bool
+     * @throws Exception
+     */
+    public function send(mixed $context, SResponse $response): mixed
+    {
+        $sendData = $this->parseData($context);
+
+        $response->setStatusCode($this->statusCode);
+        if (!isset($response->header['Content-Type'])) {
+            $response->header('Content-Type', $this->getFormat());
+        }
+        $response->header('Run-Time', $this->getRuntime());
+        $response->end($sendData);
+        Context::remove(SResponse::class);
+        return $sendData;
+    }
+
+    /**
+     * @param $context
+     * @return mixed
+     * @throws Exception
+     */
+    private function parseData($context): mixed
+    {
+        if (!empty($context) && !is_string($context)) {
+            /** @var IFormatter $class */
+            $class = $this->_format_maps[$this->format] ?? HtmlFormatter::class;
+
+            $di = Snowflake::getDi()->get($class);
+            $context = $di->send($context)->getData();
+        }
+        return $context;
+    }
+
+    /**
+     * @param $result
+     * @return void
+     * @throws Exception
+     */
+    private function printResult($result): mixed
+    {
+        $result = Help::toString($result);
+        fire('CONSOLE_END');
+        if (str_contains((string)$result, 'Event::rshutdown(): Event::wait()')) {
+            return $result;
+        }
+        $string = 'Command Result: ' . PHP_EOL . PHP_EOL;
+        if (empty($result)) {
+            $string .= 'success!' . PHP_EOL . PHP_EOL;
+        } else {
+            $string .= $result . PHP_EOL . PHP_EOL;
+        }
+        echo $string . 'Command End!' . PHP_EOL;
+        return $result;
+    }
+
+
+
+    /**
+     * @param $url
+     * @param array $param
+     * @return int
+     */
+    public function redirect($url, array $param = []): mixed
+    {
+        if (!empty($param)) {
+            $url .= '?' . http_build_query($param);
+        }
+        $url = ltrim($url, '/');
+        if (!preg_match('/^http/', $url)) {
+            $url = '/' . $url;
+        }
+        /** @var SResponse $response */
+        $response = Context::getContext('response');
+        if (!empty($response)) {
+            return $response->redirect($url);
+        }
+        return false;
+    }
+
+
+    /**
+     * @param string $path
+     * @param int $offset
+     * @param int $limit
+     * @param int $sleep
+     * @return string
+     */
+    public function sendFile(string $path, int $offset = 0, int $limit = 1024000, int $sleep = 0): string
+    {
+        $open = fopen($path, 'r');
+
+        $stat = fstat($open);
+
+
+        /** @var SResponse $response */
+        $response = Context::getContext('response');
+        $response->header('Content-length', $stat['size']);
+        while ($file = fread($open, $limit)) {
+            $response->write($file);
+            fseek($open, $offset);
+            if ($sleep > 0) sleep($sleep);
+            if ($offset >= $stat['size']) {
+                break;
+            }
+            $offset += $limit;
+        }
+        $response->end();
+        return '';
+    }
+
+
+    /**
+     * @return string
+     * @throws Exception
+     */
+    public function getRuntime(): string
+    {
+        return sprintf('%.5f', microtime(TRUE) - request()->getStartTime());
+    }
+
+}

HttpServer/Http/Request.php

@@ -426,7 +426,7 @@ class Request extends HttpService
 
 		Context::setContext(\Swoole\Http\Request::class, $request);
 
-		Context::setContext(Response::class, new Response());
+		Context::setContext(Response::class, new CoroutineResponse());
 
 		return Snowflake::getDi()->get(Request::class);
 	}

HttpServer/Http/Response.php

@@ -17,6 +17,7 @@ use HttpServer\Http\Formatter\XmlFormatter;
 use HttpServer\IInterface\IFormatter;
 use Snowflake\Core\Help;
 use Snowflake\Snowflake;
+use Swoole\Coroutine;
 use Swoole\Http\Response as SResponse;
 
 /**
@@ -55,7 +56,7 @@ class Response extends HttpService
 	 */
 	public function setFormat($format): static
 	{
-        $this->format = $format;
+        $this->__coroutine__call(__METHOD__, func_get_args());
         return $this;
 	}
 
@@ -66,7 +67,7 @@ class Response extends HttpService
 	 */
 	public function toHtml($content): string
 	{
-		$this->format = self::HTML;
+        $this->__coroutine__call(__METHOD__, func_get_args());
 		return (string)$content;
 	}
 
@@ -77,7 +78,7 @@ class Response extends HttpService
 	 */
 	public function toJson($content): string|bool
 	{
-		$this->format = self::JSON;
+        $this->__coroutine__call(__METHOD__, func_get_args());
 		return json_encode($content, JSON_UNESCAPED_UNICODE);
 	}
 
@@ -88,7 +89,7 @@ class Response extends HttpService
 	 */
 	public function toXml($content): mixed
 	{
-		$this->format = self::XML;
+        $this->__coroutine__call(__METHOD__, func_get_args());
 		return $content;
 	}
 
@@ -100,10 +101,23 @@ class Response extends HttpService
 	 */
 	public function addHeader($key, $value): static
 	{
-	    $this->headers[$key] = $value;
+	    $this->__coroutine__call(__METHOD__, func_get_args());
 		return $this;
 	}
 
+
+    /**
+     * @param $name
+     * @param $value
+     */
+	private function __coroutine__call($name, $value)
+    {
+        /** @var \HttpServer\Http\CoroutineResponse $handler */
+        $handler = Context::getContext(CoroutineResponse::class);
+        call_user_func([$handler, $name], ...$value);
+    }
+
+
 	/**
 	 * @param $name
 	 * @param null $value
@@ -118,7 +132,7 @@ class Response extends HttpService
 	 */
 	public function addCookie($name, $value = null, $expires = null, $path = null, $domain = null, $secure = null, $httponly = null, $samesite = null, $priority = null): static
 	{
-	    $this->cookies[] = func_get_args();
+        $this->__coroutine__call(__METHOD__, func_get_args());
 		return $this;
 	}
 
@@ -128,134 +142,30 @@ class Response extends HttpService
      */
 	public function setStatusCode($statusCode)
     {
-	    $this->statusCode = $statusCode;
+        $this->__coroutine__call(__METHOD__, func_get_args());
     }
 
 
-
 	/**
 	 * @param mixed $context
 	 * @param int $statusCode
-	 * @return bool
 	 * @throws Exception
 	 */
-	public function send(mixed $context, int $statusCode, SResponse $response): mixed
+	public function send(mixed $context, SResponse $response): void
 	{
-		$sendData = $this->parseData($context);
+	    $this->__coroutine__call(__METHOD__, func_get_args());
-
-        $response->setStatusCode($statusCode);
-        if (!isset($response->header['Content-Type'])) {
-            $response->header('Content-Type', 'application/json;charset=utf-8');
-        }
-        $response->header('Run-Time', $this->getRuntime());
-        $response->end($sendData);
-        Context::remove(SResponse::class);
-		return $sendData;
 	}
 
-	/**
-	 * @param $context
-	 * @return mixed
-	 * @throws Exception
-	 */
-	private function parseData($context): mixed
-	{
-		if (!empty($context) && !is_string($context)) {
-			/** @var IFormatter $class */
-			$class = $this->_format_maps[$this->format] ?? HtmlFormatter::class;
-
-			$di = Snowflake::getDi()->get($class);
-			$context = $di->send($context)->getData();
-		}
-		return $context;
-	}
-
-	/**
-	 * @param $result
-	 * @return void
-	 * @throws Exception
-	 */
-	private function printResult($result): mixed
-	{
-		$result = Help::toString($result);
-		fire('CONSOLE_END');
-		if (str_contains((string)$result, 'Event::rshutdown(): Event::wait()')) {
-			return $result;
-		}
-		$string = 'Command Result: ' . PHP_EOL . PHP_EOL;
-		if (empty($result)) {
-			$string .= 'success!' . PHP_EOL . PHP_EOL;
-		} else {
-			$string .= $result . PHP_EOL . PHP_EOL;
-		}
-		echo $string . 'Command End!' . PHP_EOL;
-		return $result;
-	}
-
-
 
 	/**
 	 * @param $url
 	 * @param array $param
 	 * @return int
 	 */
-	public function redirect($url, array $param = []): mixed
+	public function redirect($url, array $param = []): void
 	{
-		if (!empty($param)) {
+        $this->__coroutine__call(__METHOD__, func_get_args());
-			$url .= '?' . http_build_query($param);
+    }
-		}
-		$url = ltrim($url, '/');
-		if (!preg_match('/^http/', $url)) {
-			$url = '/' . $url;
-		}
-		/** @var SResponse $response */
-		$response = Context::getContext('response');
-		if (!empty($response)) {
-			return $response->redirect($url);
-		}
-		return false;
-	}
-
-
-	/**
-	 * @return static
-	 * @throws Exception
-	 */
-	public static function create(): static
-	{
-		$ciResponse = Snowflake::app()->get('response');
-		$ciResponse->startTime = microtime(true);
-		$ciResponse->format = self::JSON;
-		return $ciResponse;
-	}
-
-
-	/**
-	 * @param int $statusCode
-	 * @param string $message
-	 * @return mixed
-	 * @throws Exception
-	 */
-	public function close(int $statusCode = 200, string $message = ''): mixed
-	{
-		return $this->send($message, $statusCode);
-	}
-
-
-	/**
-	 * @param $clientId
-	 * @param int $statusCode
-	 * @param string $message
-	 * @return mixed
-	 */
-	public function closeClient($clientId, int $statusCode = 200, string $message = ''): mixed
-	{
-		$socket = Snowflake::getWebSocket();
-		if (!$socket->exist($clientId)) {
-			return true;
-		}
-		return $socket->close($clientId, true);
-	}
 
 
 	/**
@@ -265,37 +175,9 @@ class Response extends HttpService
 	 * @param int $sleep
 	 * @return string
 	 */
-	public function sendFile(string $path, int $offset = 0, int $limit = 1024000, int $sleep = 0): string
+	public function sendFile(string $path, int $offset = 0, int $limit = 1024000, int $sleep = 0): void
 	{
-		$open = fopen($path, 'r');
+        $this->__coroutine__call(__METHOD__, func_get_args());
-
+    }
-		$stat = fstat($open);
-
-
-		/** @var SResponse $response */
-		$response = Context::getContext('response');
-		$response->header('Content-length', $stat['size']);
-		while ($file = fread($open, $limit)) {
-			$response->write($file);
-			fseek($open, $offset);
-			if ($sleep > 0) sleep($sleep);
-			if ($offset >= $stat['size']) {
-				break;
-			}
-			$offset += $limit;
-		}
-		$response->end();
-		return '';
-	}
-
-
-	/**
-	 * @return string
-	 * @throws Exception
-	 */
-	public function getRuntime(): string
-	{
-		return sprintf('%.5f', microtime(TRUE) - request()->getStartTime());
-	}
 
 }

Server/HTTPServerListener.php

@@ -94,18 +94,18 @@ class HTTPServerListener extends Abstracts\Server
 		try {
             $node = $this->router->find_path(HSRequest::create($request));
             if (!($node instanceof Node)) {
+                $this->response->setStatusCode(404);
                 $this->response->setFormat(\HttpServer\Http\Response::HTML);
                 $data = '<h2>HTTP 404 Not Found</h2><hr><i>Powered by Swoole</i>';
             } else {
-                $data= $node->dispatch();
+                $this->response->setStatusCode(200);
+                $data = $node->dispatch();
             }
         } catch (Error | Throwable $exception) {
+            $this->response->setStatusCode(500);
             $data = jTraceEx($exception);
 		} finally {
-		    if (Context::hasContext(Response::class)) {
+            $this->response->send($data, $response);
-		        return;
-            }
-            \response()->send($data,200, $response);
 			$this->eventDispatch->dispatch(new OnAfterRequest());
 		}
 	}