cphipps/watchstate
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Better response when the WebUI isn't compiled.

Browse Source
This commit is contained in:
Abdulmhsen B. A. A
2024-05-15 17:14:37 +03:00
parent b119601a48
commit 0c4edbcfe4
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Libs/Initializer.php
View File

@@ -21,7 +21,6 @@ use Monolog\Handler\SyslogHandler;
use Monolog\Level; use Monolog\Level;
use Monolog\Logger; use Monolog\Logger;
use Nyholm\Psr7\Factory\Psr17Factory; use Nyholm\Psr7\Factory\Psr17Factory;
use Nyholm\Psr7\Response;
use Nyholm\Psr7Server\ServerRequestCreator; use Nyholm\Psr7Server\ServerRequestCreator;
use Psr\Http\Message\ResponseInterface as iResponse; use Psr\Http\Message\ResponseInterface as iResponse;
use Psr\Http\Message\ServerRequestInterface as iRequest; use Psr\Http\Message\ServerRequestInterface as iRequest;
@@ -209,7 +208,16 @@ final class Initializer
$routeException = true === ($e instanceof RouterHttpException); $routeException = true === ($e instanceof RouterHttpException);
$isNormal = true === ($httpException || $routeException); $isNormal = true === ($httpException || $routeException);
if (!$isNormal) { $statusCode = $isNormal && ($e->getCode() >= 200 && $e->getCode() <= 499) ? $e->getCode() : 503;
$response = addCors(
api_error(
message: $isNormal ? "{$e->getCode()}: {$e->getMessage()}" : 'Unable to serve request.',
httpCode: HTTP_STATUS::tryFrom($statusCode) ?? HTTP_STATUS::HTTP_SERVICE_UNAVAILABLE,
)
);
if (!$isNormal || HTTP_STATUS::HTTP_SERVICE_UNAVAILABLE->value === $statusCode) {
Container::get(LoggerInterface::class)->error( Container::get(LoggerInterface::class)->error(
message: $e->getMessage(), message: $e->getMessage(),
context: [ context: [
@@ -221,12 +229,6 @@ final class Initializer
); );
} }
$statusCode = $isNormal && ($e->getCode() >= 200 && $e->getCode() <= 499) ? $e->getCode() : 500;
$response = new Response(
status: $statusCode,
body: $isNormal ? "{$e->getCode()}: {$e->getMessage()}" : 'Unable to serve request.'
);
$this->write($request, Level::Info, $this->formatLog($request, $response)); $this->write($request, Level::Info, $this->formatLog($request, $response));
} }
@@ -271,6 +273,7 @@ final class Initializer
); );
return $response; return $response;
} }
return (new ServeStatic())->serve($request); return (new ServeStatic())->serve($request);
} }

2
src/Libs/ServeStatic.php
View File

@@ -31,8 +31,6 @@ final class ServeStatic
if (null === $this->staticPath) { if (null === $this->staticPath) {
$this->staticPath = Config::get('webui.path', __DIR__ . '/../../public/exported'); $this->staticPath = Config::get('webui.path', __DIR__ . '/../../public/exported');
} }
$this->staticPath = realpath($this->staticPath);
} }
/** /**