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

wip

Browse Source
This commit is contained in:
Marcel Pociot
2020-05-03 21:38:33 +02:00
parent 141412762a
commit 7d0a570d85
7 changed files with 83 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Client/Client.php
View File

@@ -65,13 +65,13 @@ class Client
});
$connection->on('authenticationFailed', function ($data) use ($deferred) {
$this->logger->error($data->data->message);
$this->logger->error($data->message);
$this->exit($deferred);
});
$connection->on('subdomainTaken', function ($data) use ($deferred) {
$this->logger->error($data->data->message);
$this->logger->error($data->message);
$this->exit($deferred);
});
@@ -94,6 +94,7 @@ class Client
$host .= ":{$this->configuration->port()}";
}
$this->logger->info($data->message);
$this->logger->info("Connected to {$httpProtocol}://{$data->subdomain}.{$host}");
static::$subdomains[] = "$data->subdomain.{$this->configuration->host()}:{$this->configuration->port()}";

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

@@ -34,10 +34,10 @@ class ControlConnection
$this->socket->on('message', function (Message $message) {
$decodedEntry = json_decode($message);
$this->emit($decodedEntry->event ?? '', [$decodedEntry]);
$this->emit($decodedEntry->event ?? '', [$decodedEntry->data]);
if (method_exists($this, $decodedEntry->event ?? '')) {
call_user_func([$this, $decodedEntry->event], $decodedEntry);
call_user_func([$this, $decodedEntry->event], $decodedEntry->data);
}
});
}

6
app/Server/Connections/ControlConnection.php
View File

@@ -45,8 +45,10 @@ class ControlConnection
{
$this->socket->send(json_encode([
'event' => 'createProxy',
'request_id' => $requestId,
'client_id' => $this->client_id,
'data' => [
'request_id' => $requestId,
'client_id' => $this->client_id,
],
]));
}
}

6
app/Server/Http/Controllers/Admin/SaveSettingsController.php
View File

@@ -32,6 +32,12 @@ class SaveSettingsController extends AdminController
{
config()->set('expose.admin.validate_auth_tokens', $request->has('validate_auth_tokens'));
config()->set('expose.admin.messages.invalid_auth_token', $request->get('invalid_auth_token'));
config()->set('expose.admin.messages.subdomain_taken', $request->get('subdomain_taken'));
config()->set('expose.admin.messages.message_of_the_day', $request->get('motd'));
$httpConnection->send(str(new Response(301, [
'Location' => '/settings'
])));

7
app/Server/Http/Controllers/ControlMessageController.php
View File

@@ -89,8 +89,11 @@ class ControlMessageController implements MessageComponentInterface
$connection->send(json_encode([
'event' => 'authenticated',
'subdomain' => $connectionInfo->subdomain,
'client_id' => $connectionInfo->client_id
'data' => [
'message' => config('expose.admin.messages.message_of_the_day'),
'subdomain' => $connectionInfo->subdomain,
'client_id' => $connectionInfo->client_id
],
]));
}, function () use ($connection) {
$connection->send(json_encode([