diff --git a/app/Client/Http/HttpClient.php b/app/Client/Http/HttpClient.php index 0f6b922..97364dd 100644 --- a/app/Client/Http/HttpClient.php +++ b/app/Client/Http/HttpClient.php @@ -101,12 +101,6 @@ class HttpClient $response->buffer .= $chunk; $this->sendChunkToServer($chunk, $proxyConnection); - - if ($chunk === "") { - $this->logResponse($response->buffer); - - optional($proxyConnection)->close(); - } }); $body->on('close', function () use ($proxyConnection, $response) { diff --git a/app/Logger/CliRequestLogger.php b/app/Logger/CliRequestLogger.php index 2cce701..18741e4 100644 --- a/app/Logger/CliRequestLogger.php +++ b/app/Logger/CliRequestLogger.php @@ -32,6 +32,7 @@ class CliRequestLogger extends Logger public function logRequest(LoggedRequest $loggedRequest) { + return; if ($this->requests->has($loggedRequest->id())) { $this->requests[$loggedRequest->id()] = $loggedRequest; } else { diff --git a/app/Server/Http/Controllers/Admin/ListSitesController.php b/app/Server/Http/Controllers/Admin/ListSitesController.php index 707ab1c..c9dd5dc 100644 --- a/app/Server/Http/Controllers/Admin/ListSitesController.php +++ b/app/Server/Http/Controllers/Admin/ListSitesController.php @@ -4,6 +4,7 @@ namespace App\Server\Http\Controllers\Admin; use App\Contracts\ConnectionManager; use App\HttpServer\Controllers\PostController; +use App\Server\Configuration; use Clue\React\SQLite\DatabaseInterface; use Clue\React\SQLite\Result; use GuzzleHttp\Psr7\Response; @@ -18,16 +19,23 @@ class ListSitesController extends PostController { /** @var ConnectionManager */ protected $connectionManager; + /** @var Configuration */ + protected $configuration; - public function __construct(ConnectionManager $connectionManager) + public function __construct(ConnectionManager $connectionManager, Configuration $configuration) { $this->connectionManager = $connectionManager; + $this->configuration = $configuration; } public function handle(Request $request, ConnectionInterface $httpConnection) { try { - $sites = $this->getView('server.sites.index', ['sites' => $this->connectionManager->getConnections()]); + $sites = $this->getView('server.sites.index', [ + 'scheme' => $this->configuration->port() === 443 ? 'https' : 'http', + 'configuration' => $this->configuration, + 'sites' => $this->connectionManager->getConnections() + ]); } catch (\Exception $e) { dump($e->getMessage()); } diff --git a/resources/views/server/sites/index.twig b/resources/views/server/sites/index.twig index 74d8259..878f847 100644 --- a/resources/views/server/sites/index.twig +++ b/resources/views/server/sites/index.twig @@ -27,13 +27,13 @@ {{ site.host }} - {{ site.subdomain }}.localhost:8080 + {{ site.subdomain }}.{{ configuration.hostname()}}:{{ configuration.port() }} {{ site.shared_at }} - Visit