bitinflow/expose
1
0
Fork 0
mirror of https://github.com/bitinflow/expose.git synced 2026-03-15 14:35:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow users to specify custom hostnames

Browse Source
This commit is contained in:
Marcel Pociot
2020-11-01 22:40:17 +01:00
parent 5b7a80bb0c
commit cec52c4229
28 changed files with 913 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/Client/Client.php
View File

@@ -40,12 +40,12 @@ class Client
$this->logger = $logger;
}
public function share(string $sharedUrl, array $subdomains = [])
public function share(string $sharedUrl, array $subdomains = [], string $hostname = '')
{
$sharedUrl = $this->prepareSharedUrl($sharedUrl);
foreach ($subdomains as $subdomain) {
$this->connectToServer($sharedUrl, $subdomain, config('expose.auth_token'));
$this->connectToServer($sharedUrl, $subdomain, $hostname, config('expose.auth_token'));
}
}
@@ -72,7 +72,7 @@ class Client
return $url;
}
public function connectToServer(string $sharedUrl, $subdomain, $authToken = ''): PromiseInterface
public function connectToServer(string $sharedUrl, $subdomain, $hostname = '', $authToken = ''): PromiseInterface
{
$deferred = new Deferred();
$promise = $deferred->promise();
@@ -82,18 +82,18 @@ class Client
connect($wsProtocol."://{$this->configuration->host()}:{$this->configuration->port()}/expose/control?authToken={$authToken}", [], [
'X-Expose-Control' => 'enabled',
], $this->loop)
->then(function (WebSocket $clientConnection) use ($sharedUrl, $subdomain, $deferred, $authToken) {
->then(function (WebSocket $clientConnection) use ($sharedUrl, $subdomain, $hostname, $deferred, $authToken) {
$this->connectionRetries = 0;
$connection = ControlConnection::create($clientConnection);
$connection->authenticate($sharedUrl, $subdomain);
$connection->authenticate($sharedUrl, $subdomain, $hostname);
$clientConnection->on('close', function () use ($sharedUrl, $subdomain, $authToken) {
$clientConnection->on('close', function () use ($sharedUrl, $subdomain, $hostname, $authToken) {
$this->logger->error('Connection to server closed.');
$this->retryConnectionOrExit(function () use ($sharedUrl, $subdomain, $authToken) {
$this->connectToServer($sharedUrl, $subdomain, $authToken);
$this->retryConnectionOrExit(function () use ($sharedUrl, $subdomain, $hostname, $authToken) {
$this->connectToServer($sharedUrl, $subdomain, $hostname, $authToken);
});
});
@@ -113,10 +113,16 @@ class Client
$host .= ":{$this->configuration->port()}";
}
if ($data->hostname !== '' && ! is_null($data->hostname)) {
$exposeUrl = "{$httpProtocol}://{$data->hostname}";
} else {
$exposeUrl = "{$httpProtocol}://{$data->subdomain}.{$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'));
$this->logger->info("Expose-URL:\t\t{$httpProtocol}://{$data->subdomain}.{$host}");
$this->logger->info("Expose-URL:\t\t{$exposeUrl}");
$this->logger->line('');
static::$subdomains[] = "{$httpProtocol}://{$data->subdomain}.{$host}";

3
app/Client/Connections/ControlConnection.php
View File

@@ -57,7 +57,7 @@ class ControlConnection
$this->proxyManager->createTcpProxy($this->clientId, $data);
}
public function authenticate(string $sharedHost, string $subdomain)
public function authenticate(string $sharedHost, ?string $subdomain, ?string $hostname)
{
$this->socket->send(json_encode([
'event' => 'authenticate',
@@ -65,6 +65,7 @@ class ControlConnection
'type' => 'http',
'host' => $sharedHost,
'subdomain' => empty($subdomain) ? null : $subdomain,
'hostname' => empty($hostname) ? null : $hostname,
],
]));
}

4
app/Client/Factory.php
View File

@@ -102,9 +102,9 @@ class Factory
return $this;
}
public function share($sharedUrl, $subdomain = null)
public function share($sharedUrl, $subdomain = null, $hostname = null)
{
app('expose.client')->share($sharedUrl, $subdomain);
app('expose.client')->share($sharedUrl, $subdomain, $hostname);
return $this;
}