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

Merge branch 'dashboard-modifications' into share-files

Browse Source
This commit is contained in:
Marcel Pociot
2021-05-19 11:57:25 +02:00
parent 44dca53687 60ce7816a2
commit 96fa7c653f
8 changed files with 170 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Client/Factory.php
View File

@@ -140,7 +140,7 @@ class Factory
$this->router->post('/api/logs/{request_id}/data', AttachDataToLogController::class);
$this->router->get('/api/logs/clear', ClearLogsController::class);
$this->app->route('/socket', new WsServer(new Socket()), ['*']);
$this->app->route('/socket', new WsServer(new Socket()), ['*'], "");
foreach ($this->router->getRoutes()->all() as $name => $route) {
$this->app->routes->add($name, $route);
@@ -162,7 +162,7 @@ class Factory
config()->set('expose.dashboard_port', $dashboardPort);
$this->app = new App('127.0.0.1', $dashboardPort, '0.0.0.0', $this->loop);
$this->app = new App('0.0.0.0', $dashboardPort, '0.0.0.0', $this->loop);
$this->addRoutes();

12
app/Client/Http/Controllers/ReplayLogController.php
View File

@@ -4,8 +4,12 @@ namespace App\Client\Http\Controllers;
use App\Client\Http\HttpClient;
use App\Http\Controllers\Controller;
use App\Logger\LoggedRequest;
use App\Logger\RequestLogger;
use GuzzleHttp\Psr7\Message;
use GuzzleHttp\Psr7\Response;
use Illuminate\Support\Str;
use Laminas\Http\Header\GenericHeader;
use function GuzzleHttp\Psr7\str;
use Illuminate\Http\Request;
use Ratchet\ConnectionInterface;
@@ -29,13 +33,15 @@ class ReplayLogController extends Controller
$loggedRequest = $this->requestLogger->findLoggedRequest($request->get('log'));
if (is_null($loggedRequest)) {
$httpConnection->send(str(new Response(404)));
$httpConnection->send(Message::toString(new Response(404)));
return;
}
$this->httpClient->performRequest($loggedRequest->getRequestData());
$loggedRequest->refreshId();
$httpConnection->send(str(new Response(200)));
$this->httpClient->performRequest($loggedRequest->getRequest()->toString());
$httpConnection->send(Message::toString(new Response(200)));
}
}