This commit is contained in:
2025-12-01 06:19:25 +08:00
parent 90ee572092
commit 79ce7142d9
2 changed files with 443 additions and 397 deletions
-2
View File
@@ -18,7 +18,5 @@
"psr-4": { "psr-4": {
"Kiri\\Router\\": "./src" "Kiri\\Router\\": "./src"
} }
},
"require-dev": {
} }
} }
+443 -395
View File
@@ -8,6 +8,33 @@ use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\StreamInterface; use Psr\Http\Message\StreamInterface;
/**
* @param string $path
* @param array $data
*
* @return ResponseInterface
*/
function View(string $path, array $data = []): ResponseInterface
{
$response = \response();
$response->withAddedHeader('Content-Type', 'text/html; charset=utf-8');
try {
ob_start();
$__path = $path;
$__data = $data;
extract($__data, EXTR_SKIP);
require APP_PATH . 'resources/view/' . $path . '.php';
$content = ltrim(ob_get_clean());
} catch (\Exception $e) {
$content = throwable($e);
} finally {
return $response->html($content);
}
}
/** /**
* *
*/ */
@@ -15,443 +42,464 @@ class Response implements ResponseInterface
{ {
/** /**
* @var ContentType * @var ContentType
*/ */
public ContentType $contentType = ContentType::JSON; public ContentType $contentType = ContentType::JSON;
/** /**
* @var array * @var array
*/ */
public array $headers = []; public array $headers = [];
/** /**
* @var string|ResponseEmitterInterface * @var string|ResponseEmitterInterface
*/ */
public string|ResponseEmitterInterface $emmit = SwooleHttpResponseEmitter::class; public string|ResponseEmitterInterface $emmit = SwooleHttpResponseEmitter::class;
/** /**
* 初始化 * 初始化
*/ */
public function __construct() public function __construct()
{ {
$this->contentType = \config('response.content-type', ContentType::JSON); $this->contentType = \config('response.content-type', ContentType::JSON);
$this->headers = \config('response.headers', []); $this->headers = \config('response.headers', []);
$this->emmit = \config('response.emmit', SwooleHttpResponseEmitter::class); $this->emmit = \config('response.emmit', SwooleHttpResponseEmitter::class);
} }
/** /**
* @return void * @return void
* @throws * @throws
*/ */
public function init(): void public function init(): void
{ {
if (is_string($this->emmit)) { if (is_string($this->emmit)) {
$this->emmit = di($this->emmit); $this->emmit = di($this->emmit);
} }
} }
/** /**
* @param ContentType $contentType * @param ContentType $contentType
* @return Response *
*/ * @return Response
public function withContentType(ContentType $contentType): ResponseInterface */
{ public function withContentType(ContentType $contentType): ResponseInterface
return $this->__call__(__FUNCTION__, $contentType); {
} return $this->__call__(__FUNCTION__, $contentType);
}
/** /**
* @param array $content * @param array $content
* @param int $statusCode * @param int $statusCode
* @return ResponseInterface *
*/ * @return ResponseInterface
public function json(array $content, int $statusCode = 200): ResponseInterface */
{ public function json(array $content, int $statusCode = 200): ResponseInterface
return $this->__call__(__FUNCTION__, $content, $statusCode); {
} return $this->__call__(__FUNCTION__, $content, $statusCode);
}
/** /**
* @param string $url * @param string $url
* @param array $params * @param array $params
* @param int $statusCode * @param int $statusCode
* @return ResponseInterface *
*/ * @return ResponseInterface
public function redirectTo(string $url, array $params = [], int $statusCode = 302): ResponseInterface */
{ public function redirectTo(string $url, array $params = [], int $statusCode = 302): ResponseInterface
return $this->__call__(__FUNCTION__, $url, $params, $statusCode); {
} return $this->__call__(__FUNCTION__, $url, $params, $statusCode);
}
/** /**
* @param array $content * @param array $content
* @param int $statusCode * @param int $statusCode
* @return ResponseInterface *
*/ * @return ResponseInterface
public function xml(array $content, int $statusCode = 200): ResponseInterface */
{ public function xml(array $content, int $statusCode = 200): ResponseInterface
return $this->__call__(__FUNCTION__, $content, $statusCode); {
} return $this->__call__(__FUNCTION__, $content, $statusCode);
}
/** /**
* @param string $content * @param string $content
* @param int $statusCode * @param int $statusCode
* @return ResponseInterface *
*/ * @return ResponseInterface
public function html(string $content = '', int $statusCode = 200): ResponseInterface */
{ public function html(string $content = '', int $statusCode = 200): ResponseInterface
return $this->__call__(__FUNCTION__, $content, $statusCode); {
} return $this->__call__(__FUNCTION__, $content, $statusCode);
}
/** /**
* @param string $content * @param string $content
* @param int $statusCode * @param int $statusCode
* @return ResponseInterface *
*/ * @return ResponseInterface
public function sendfile(string $content, int $statusCode = 200): ResponseInterface */
{ public function sendfile(string $content, int $statusCode = 200): ResponseInterface
return $this->__call__(__FUNCTION__, $content, $statusCode); {
} return $this->__call__(__FUNCTION__, $content, $statusCode);
}
/** /**
* @param mixed $data * @param mixed $data
* @param int $statusCode * @param int $statusCode
* @param ContentType $type * @param ContentType $type
* @return Response *
*/ * @return Response
public function write(mixed $data, int $statusCode = 200, ContentType $type = ContentType::HTML): ResponseInterface */
{ public function write(mixed $data, int $statusCode = 200, ContentType $type = ContentType::HTML): ResponseInterface
return $this->__call__(__FUNCTION__, $data, $statusCode, $type); {
} return $this->__call__(__FUNCTION__, $data, $statusCode, $type);
}
/** /**
* @param string $method * @param string $method
* @param mixed ...$params * @param mixed ...$params
* @return mixed *
*/ * @return mixed
private function __call__(string $method, ...$params): mixed */
{ private function __call__(string $method, ...$params): mixed
return \response()->{$method}(...$params); {
} return \response()->{$method}(...$params);
}
/** /**
* @param array $cookies * @param array $cookies
* @return ResponseInterface *
*/ * @return ResponseInterface
public function withCookieParams(array $cookies): ResponseInterface */
{ public function withCookieParams(array $cookies): ResponseInterface
return $this->__call__(__FUNCTION__, $cookies); {
} return $this->__call__(__FUNCTION__, $cookies);
}
/** /**
* @return array * @return array
*/ */
public function getCookieParams(): array public function getCookieParams(): array
{ {
return $this->__call__(__FUNCTION__); return $this->__call__(__FUNCTION__);
} }
/** /**
* Retrieves the HTTP protocol version as a string. * Retrieves the HTTP protocol version as a string.
* *
* The string MUST contain only the HTTP version number (e.g., "1.1", "1.0"). * The string MUST contain only the HTTP version number (e.g., "1.1", "1.0").
* *
* @return string HTTP protocol version. * @return string HTTP protocol version.
*/ */
public function getProtocolVersion(): string public function getProtocolVersion(): string
{ {
// TODO: Implement getProtocolVersion() method. // TODO: Implement getProtocolVersion() method.
return $this->__call__(__FUNCTION__); return $this->__call__(__FUNCTION__);
} }
/** /**
* Return an instance with the specified HTTP protocol version. * Return an instance with the specified HTTP protocol version.
* *
* The version string MUST contain only the HTTP version number (e.g., * The version string MUST contain only the HTTP version number (e.g.,
* "1.1", "1.0"). * "1.1", "1.0").
* *
* This method MUST be implemented in such a way as to retain the * This method MUST be implemented in such a way as to retain the
* immutability of the message, and MUST return an instance that has the * immutability of the message, and MUST return an instance that has the
* new protocol version. * new protocol version.
* *
* @param string $version HTTP protocol version * @param string $version HTTP protocol version
* @return static *
*/ * @return static
public function withProtocolVersion(string $version): ResponseInterface */
{ public function withProtocolVersion(string $version): ResponseInterface
// TODO: Implement withProtocolVersion() method. {
return $this->__call__(__FUNCTION__, $version); // TODO: Implement withProtocolVersion() method.
} return $this->__call__(__FUNCTION__, $version);
}
/** /**
* Retrieves all message header values. * Retrieves all message header values.
* *
* The keys represent the header name as it will be sent over the wire, and * The keys represent the header name as it will be sent over the wire, and
* each value is an array of strings associated with the header. * each value is an array of strings associated with the header.
* *
* // Represent the headers as a string * // Represent the headers as a string
* foreach ($message->getHeaders() as $name => $values) { * foreach ($message->getHeaders() as $name => $values) {
* echo $name . ": " . implode(", ", $values); * echo $name . ": " . implode(", ", $values);
* } * }
* *
* // Emit headers iteratively: * // Emit headers iteratively:
* foreach ($message->getHeaders() as $name => $values) { * foreach ($message->getHeaders() as $name => $values) {
* foreach ($values as $value) { * foreach ($values as $value) {
* header(sprintf('%s: %s', $name, $value), false); * header(sprintf('%s: %s', $name, $value), false);
* } * }
* } * }
* *
* While header names are not case-sensitive, getHeaders() will preserve the * While header names are not case-sensitive, getHeaders() will preserve the
* exact case in which headers were originally specified. * exact case in which headers were originally specified.
* *
* @return string[][] Returns an associative array of the message's headers. Each * @return string[][] Returns an associative array of the message's headers. Each
* key MUST be a header name, and each value MUST be an array of strings * key MUST be a header name, and each value MUST be an array of strings
* for that header. * for that header.
*/ */
public function getHeaders(): array public function getHeaders(): array
{ {
// TODO: Implement getHeaders() method. // TODO: Implement getHeaders() method.
return $this->__call__(__FUNCTION__); return $this->__call__(__FUNCTION__);
} }
/** /**
* Checks if a header exists by the given case-insensitive name. * Checks if a header exists by the given case-insensitive name.
* *
* @param string $name Case-insensitive header field name. * @param string $name Case-insensitive header field name.
* @return bool Returns true if any header names match the given header *
* name using a case-insensitive string comparison. Returns false if * @return bool Returns true if any header names match the given header
* no matching header name is found in the message. * name using a case-insensitive string comparison. Returns false if
*/ * no matching header name is found in the message.
public function hasHeader(string $name): bool */
{ public function hasHeader(string $name): bool
// TODO: Implement hasHeader() method. {
return $this->__call__(__FUNCTION__, $name); // TODO: Implement hasHeader() method.
} return $this->__call__(__FUNCTION__, $name);
}
/** /**
* Retrieves a message header value by the given case-insensitive name. * Retrieves a message header value by the given case-insensitive name.
* *
* This method returns an array of all the header values of the given * This method returns an array of all the header values of the given
* case-insensitive header name. * case-insensitive header name.
* *
* If the header does not appear in the message, this method MUST return an * If the header does not appear in the message, this method MUST return an
* empty array. * empty array.
* *
* @param string $name Case-insensitive header field name. * @param string $name Case-insensitive header field name.
* @return string[] An array of string values as provided for the given *
* header. If the header does not appear in the message, this method MUST * @return string[] An array of string values as provided for the given
* return an empty array. * header. If the header does not appear in the message, this method MUST
*/ * return an empty array.
public function getHeader(string $name): array */
{ public function getHeader(string $name): array
// TODO: Implement getHeader() method. {
return $this->__call__(__FUNCTION__, $name); // TODO: Implement getHeader() method.
} return $this->__call__(__FUNCTION__, $name);
}
/** /**
* Retrieves a comma-separated string of the values for a single header. * Retrieves a comma-separated string of the values for a single header.
* *
* This method returns all the header values of the given * This method returns all the header values of the given
* case-insensitive header name as a string concatenated together using * case-insensitive header name as a string concatenated together using
* a comma. * a comma.
* *
* NOTE: Not all header values may be appropriately represented using * NOTE: Not all header values may be appropriately represented using
* comma concatenation. For such headers, use getHeader() instead * comma concatenation. For such headers, use getHeader() instead
* and supply your own delimiter when concatenating. * and supply your own delimiter when concatenating.
* *
* If the header does not appear in the message, this method MUST return * If the header does not appear in the message, this method MUST return
* an empty string. * an empty string.
* *
* @param string $name Case-insensitive header field name. * @param string $name Case-insensitive header field name.
* @return string A string of values as provided for the given header *
* concatenated together using a comma. If the header does not appear in * @return string A string of values as provided for the given header
* the message, this method MUST return an empty string. * concatenated together using a comma. If the header does not appear in
*/ * the message, this method MUST return an empty string.
public function getHeaderLine(string $name): string */
{ public function getHeaderLine(string $name): string
// TODO: Implement getHeaderLine() method. {
return $this->__call__(__FUNCTION__, $name); // TODO: Implement getHeaderLine() method.
} return $this->__call__(__FUNCTION__, $name);
}
/** /**
* Return an instance with the provided value replacing the specified header. * Return an instance with the provided value replacing the specified header.
* *
* While header names are case-insensitive, the casing of the header will * While header names are case-insensitive, the casing of the header will
* be preserved by this function, and returned from getHeaders(). * be preserved by this function, and returned from getHeaders().
* *
* This method MUST be implemented in such a way as to retain the * This method MUST be implemented in such a way as to retain the
* immutability of the message, and MUST return an instance that has the * immutability of the message, and MUST return an instance that has the
* new and/or updated header and value. * new and/or updated header and value.
* *
* @param string $name Case-insensitive header field name. * @param string $name Case-insensitive header field name.
* @param string|string[] $value Header value(s). * @param string|string[] $value Header value(s).
* @return static *
* @throws * @return static
*/ * @throws
public function withHeader(string $name, $value): ResponseInterface */
{ public function withHeader(string $name, $value): ResponseInterface
// TODO: Implement withHeader() method. {
return $this->__call__(__FUNCTION__, $name, $value); // TODO: Implement withHeader() method.
} return $this->__call__(__FUNCTION__, $name, $value);
}
/** /**
* @param array $headers * @param array $headers
* @return ResponseInterface *
*/ * @return ResponseInterface
public function withHeaders(array $headers): ResponseInterface */
{ public function withHeaders(array $headers): ResponseInterface
return $this->__call__(__FUNCTION__, $headers); {
} return $this->__call__(__FUNCTION__, $headers);
}
/** /**
* Return an instance with the specified header appended with the given value. * Return an instance with the specified header appended with the given value.
* *
* Existing values for the specified header will be maintained. The new * Existing values for the specified header will be maintained. The new
* value(s) will be appended to the existing list. If the header did not * value(s) will be appended to the existing list. If the header did not
* exist previously, it will be added. * exist previously, it will be added.
* *
* This method MUST be implemented in such a way as to retain the * This method MUST be implemented in such a way as to retain the
* immutability of the message, and MUST return an instance that has the * immutability of the message, and MUST return an instance that has the
* new header and/or value. * new header and/or value.
* *
* @param string $name Case-insensitive header field name to add. * @param string $name Case-insensitive header field name to add.
* @param string|string[] $value Header value(s). * @param string|string[] $value Header value(s).
* @return static *
* @throws * @return static
*/ * @throws
public function withAddedHeader(string $name, $value): ResponseInterface */
{ public function withAddedHeader(string $name, $value): ResponseInterface
// TODO: Implement withAddedHeader() method. {
return $this->__call__(__FUNCTION__, $name, $value); // TODO: Implement withAddedHeader() method.
} return $this->__call__(__FUNCTION__, $name, $value);
}
/** /**
* Return an instance without the specified header. * Return an instance without the specified header.
* *
* Header resolution MUST be done without case-sensitivity. * Header resolution MUST be done without case-sensitivity.
* *
* This method MUST be implemented in such a way as to retain the * This method MUST be implemented in such a way as to retain the
* immutability of the message, and MUST return an instance that removes * immutability of the message, and MUST return an instance that removes
* the named header. * the named header.
* *
* @param string $name Case-insensitive header field name to remove. * @param string $name Case-insensitive header field name to remove.
* @return static *
*/ * @return static
public function withoutHeader(string $name): ResponseInterface */
{ public function withoutHeader(string $name): ResponseInterface
// TODO: Implement withoutHeader() method. {
return $this->__call__(__FUNCTION__, $name); // TODO: Implement withoutHeader() method.
} return $this->__call__(__FUNCTION__, $name);
}
/** /**
* Gets the body of the message. * Gets the body of the message.
* *
* @return StreamInterface Returns the body as a stream. * @return StreamInterface Returns the body as a stream.
*/ */
public function getBody(): StreamInterface public function getBody(): StreamInterface
{ {
// TODO: Implement getBody() method. // TODO: Implement getBody() method.
return $this->__call__(__FUNCTION__); return $this->__call__(__FUNCTION__);
} }
/** /**
* Return an instance with the specified message body. * Return an instance with the specified message body.
* *
* The body MUST be a StreamInterface object. * The body MUST be a StreamInterface object.
* *
* This method MUST be implemented in such a way as to retain the * This method MUST be implemented in such a way as to retain the
* immutability of the message, and MUST return a new instance that has the * immutability of the message, and MUST return a new instance that has the
* new body stream. * new body stream.
* *
* @param StreamInterface $body Body. * @param StreamInterface $body Body.
* @return static *
* @throws * @return static
*/ * @throws
public function withBody(StreamInterface $body): ResponseInterface */
{ public function withBody(StreamInterface $body): ResponseInterface
// TODO: Implement withBody() method. {
return $this->__call__(__FUNCTION__, $body); // TODO: Implement withBody() method.
} return $this->__call__(__FUNCTION__, $body);
}
/** /**
* Gets the response status code. * Gets the response status code.
* *
* The status code is a 3-digit integer result code of the server's attempt * The status code is a 3-digit integer result code of the server's attempt
* to understand and satisfy the request. * to understand and satisfy the request.
* *
* @return int Status code. * @return int Status code.
*/ */
public function getStatusCode(): int public function getStatusCode(): int
{ {
// TODO: Implement getStatusCode() method. // TODO: Implement getStatusCode() method.
return $this->__call__(__FUNCTION__); return $this->__call__(__FUNCTION__);
} }
/** /**
* @param string $content * @param string $content
* @param int $statusCode * @param int $statusCode
* @param ContentType $contentType * @param ContentType $contentType
* @return ResponseInterface *
*/ * @return ResponseInterface
public function raw(string $content, int $statusCode = 200, ContentType $contentType = ContentType::JSON): ResponseInterface */
{ public function raw(string $content, int $statusCode = 200, ContentType $contentType = ContentType::JSON): ResponseInterface
return $this->__call__(__FUNCTION__, $content, $statusCode, $contentType); {
} return $this->__call__(__FUNCTION__, $content, $statusCode, $contentType);
}
/** /**
* Return an instance with the specified status code and, optionally, reason phrase. * Return an instance with the specified status code and, optionally, reason phrase.
* *
* If no reason phrase is specified, implementations MAY choose to default * If no reason phrase is specified, implementations MAY choose to default
* to the RFC 7231 or IANA recommended reason phrase for the response's * to the RFC 7231 or IANA recommended reason phrase for the response's
* status code. * status code.
* *
* This method MUST be implemented in such a way as to retain the * This method MUST be implemented in such a way as to retain the
* immutability of the message, and MUST return an instance that has the * immutability of the message, and MUST return an instance that has the
* updated status and reason phrase. * updated status and reason phrase.
* *
* @link http://tools.ietf.org/html/rfc7231#section-6 * @link http://tools.ietf.org/html/rfc7231#section-6
* @link http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml * @link http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
* @param int $code The 3-digit integer result code to set. *
* @param string $reasonPhrase The reason phrase to use with the * @param int $code The 3-digit integer result code to set.
* provided status code; if none is provided, implementations MAY * @param string $reasonPhrase The reason phrase to use with the
* use the defaults as suggested in the HTTP specification. * provided status code; if none is provided, implementations MAY
* @return static * use the defaults as suggested in the HTTP specification.
* @throws *
*/ * @return static
public function withStatus(int $code, string $reasonPhrase = ''): ResponseInterface * @throws
{ */
// TODO: Implement withStatus() method. public function withStatus(int $code, string $reasonPhrase = ''): ResponseInterface
return $this->__call__(__FUNCTION__, $code, $reasonPhrase); {
} // TODO: Implement withStatus() method.
return $this->__call__(__FUNCTION__, $code, $reasonPhrase);
}
/** /**
* Gets the response reason phrase associated with the status code. * Gets the response reason phrase associated with the status code.
* *
* Because a reason phrase is not a required element in a response * Because a reason phrase is not a required element in a response
* status line, the reason phrase value MAY be null. Implementations MAY * status line, the reason phrase value MAY be null. Implementations MAY
* choose to return the default RFC 7231 recommended reason phrase (or those * choose to return the default RFC 7231 recommended reason phrase (or those
* listed in the IANA HTTP Status Code Registry) for the response's * listed in the IANA HTTP Status Code Registry) for the response's
* status code. * status code.
* *
* @link http://tools.ietf.org/html/rfc7231#section-6 * @link http://tools.ietf.org/html/rfc7231#section-6
* @link http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml * @link http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
* @return string Reason phrase; must return an empty string if none present. * @return string Reason phrase; must return an empty string if none present.
*/ */
public function getReasonPhrase(): string public function getReasonPhrase(): string
{ {
// TODO: Implement getReasonPhrase() method. // TODO: Implement getReasonPhrase() method.
return $this->__call__(__FUNCTION__); return $this->__call__(__FUNCTION__);
} }
} }