Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions app/Client.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ class Client
public static $subdomains = [];
public static $localUrl = '';

protected ?string $closingMessage = null;

public function __construct(LoopInterface $loop, Configuration $configuration, CliLogger $logger)
{
$this->loop = $loop;
Expand Down Expand Up @@ -113,6 +115,10 @@ public function connectToServer(string $sharedUrl, $subdomain, $serverHost = nul
$connection->authenticate($sharedUrl, $subdomain, $serverHost);

$clientConnection->on('close', function () use ($sharedUrl, $subdomain, $serverHost, $authToken) {
if ($this->closingMessage) {
$this->logger->renderMessage($this->closingMessage);
}

$this->logger->error('Connection to server closed.');

$this->retryConnectionOrExit(function () use ($sharedUrl, $subdomain, $serverHost, $authToken) {
Expand All @@ -139,6 +145,8 @@ public function connectToServer(string $sharedUrl, $subdomain, $serverHost = nul
$this->logger->renderMessage($data->message);
}

$this->closingMessage = $data->closing_message ?? null;

$this->logger->renderConnectionTable([
"Shared site" => $sharedUrl,
"Dashboard" => "http://127.0.0.1:".config()->get('expose.dashboard_port'),
Expand Down Expand Up @@ -189,6 +197,10 @@ public function connectToServerAndShareTcp(int $port, $authToken = ''): PromiseI
$this->attachCommonConnectionListeners($connection, $deferred);

$clientConnection->on('close', function () use ($port, $authToken) {
if ($this->closingMessage) {
$this->logger->renderMessage($this->closingMessage);
}

$this->logger->error('Connection to server closed.');

$this->retryConnectionOrExit(function () use ($port, $authToken) {
Expand All @@ -205,6 +217,8 @@ public function connectToServerAndShareTcp(int $port, $authToken = ''): PromiseI
$this->logger->info("Expose-URL:\t\t<options=bold>tcp://{$host}:{$data->shared_port}</>");
$this->logger->line('');

$this->closingMessage = $data->closing_message ?? null;

$deferred->resolve($data);
});
}, function (\Exception $e) use ($deferred, $port, $authToken) {
Expand Down