This commit is contained in:
Marcel Pociot
2022-02-23 12:38:42 +01:00
parent a199aa8576
commit 89c9fa6742
6 changed files with 49 additions and 10 deletions

View File

@@ -120,6 +120,8 @@ class Client
$httpProtocol = $this->configuration->port() === 443 ? 'https' : 'http';
$host = $data->server_host ?? $this->configuration->host();
$this->configuration->setServerHost($host);
$this->logger->info($data->message);
$this->logger->info("Local-URL:\t\t{$sharedUrl}");
$this->logger->info("Dashboard-URL:\t\thttp://127.0.0.1:".config()->get('expose.dashboard_port'));

View File

@@ -6,6 +6,9 @@ class Configuration
{
/** @var string */
protected $host;
/** @var string */
protected $serverHost;
/** @var int */
protected $port;
@@ -15,7 +18,7 @@ class Configuration
public function __construct(string $host, int $port, ?string $auth = null)
{
$this->host = $host;
$this->serverHost = $this->host = $host;
$this->port = $port;
@@ -27,6 +30,11 @@ class Configuration
return $this->host;
}
public function serverHost(): string
{
return $this->serverHost;
}
public function auth(): ?string
{
return $this->auth;
@@ -37,10 +45,15 @@ class Configuration
return intval($this->port);
}
public function setServerHost($host)
{
$this->serverHost = $host;
}
public function getUrl(string $subdomain): string
{
$httpProtocol = $this->port() === 443 ? 'https' : 'http';
$host = $this->host();
$host = $this->serverHost();
if ($httpProtocol !== 'https') {
$host .= ":{$this->port()}";

View File

@@ -29,7 +29,7 @@ abstract class ServerAwareCommand extends Command
protected function configureConnectionLogger()
{
app()->bind(CliRequestLogger::class, function () {
app()->singleton(CliRequestLogger::class, function () {
return new CliRequestLogger(new ConsoleOutput());
});

View File

@@ -69,6 +69,8 @@ class CliRequestLogger extends Logger
public function logRequest(LoggedRequest $loggedRequest)
{
$dashboardUrl = 'http://127.0.0.1:'.config('expose.dashboard_port');
if ($this->requests->has($loggedRequest->id())) {
$this->requests[$loggedRequest->id()] = $loggedRequest;
} else {
@@ -78,11 +80,11 @@ class CliRequestLogger extends Logger
$this->section->clear();
$this->table->setRows($this->requests->map(function (LoggedRequest $loggedRequest) {
$this->table->setRows($this->requests->map(function (LoggedRequest $loggedRequest) use ($dashboardUrl) {
return [
$loggedRequest->getRequest()->getMethod(),
$loggedRequest->getRequest()->getUri(),
'<href=foo;fg='.$this->getRequestColor($loggedRequest).';options=bold>'.
'<href='.$dashboardUrl.'/#'.$loggedRequest->id().';fg='.$this->getRequestColor($loggedRequest).';options=bold>'.
optional($loggedRequest->getResponse())->getStatusCode().' '.optional($loggedRequest->getResponse())->getReasonPhrase()
.'</>'
,