wip

app/Client/Client.php

@@ -12,6 +12,7 @@ class Client
     protected $loop;
     protected $host;
     protected $port;
+    public static $subdomains = [];
 
     public function __construct(LoopInterface $loop, $host, $port)
     {
@@ -31,6 +32,7 @@ class Client
                     $connection->authenticate($sharedUrl, $subdomain);
 
                     $clientConnection->on('authenticated', function ($data) {
+                        static::$subdomains[] = "$data->subdomain.{$this->host}:{$this->port}";
                         dump("Connected to http://$data->subdomain.{$this->host}:{$this->port}");
                     });
                 });

app/Client/Connection.php

@@ -71,4 +71,11 @@ class Connection
             ],
         ]));
     }
+
+    public function ping()
+    {
+        $this->socket->write(json_encode([
+            'event' => 'pong',
+        ]));
+    }
 }

app/Client/Factory.php

@@ -3,6 +3,8 @@
 namespace App\Client;
 
 use App\HttpServer\App;
+use App\HttpServer\Controllers\AttachDataToLogController;
+use App\HttpServer\Controllers\ClearLogsController;
 use App\HttpServer\Controllers\DashboardController;
 use App\HttpServer\Controllers\LogController;
 use App\HttpServer\Controllers\ReplayLogController;
@@ -67,6 +69,8 @@ class Factory
         $logRoute = new Route('/logs', ['_controller' => new LogController()], [], [], null, [], ['GET']);
         $storeLogRoute = new Route('/logs', ['_controller' => new StoreLogController()], [], [], null, [], ['POST']);
         $replayLogRoute = new Route('/replay/{log}', ['_controller' => new ReplayLogController()], [], [], null, [], ['GET']);
+        $attachLogDataRoute = new Route('/logs/{request_id}/data', ['_controller' => new AttachDataToLogController()], [], [], null, [], ['POST']);
+        $clearLogsRoute = new Route('/logs/clear', ['_controller' => new ClearLogsController()], [], [], null, [], ['GET']);
 
         $this->app->route('/socket', new WsServer(new Socket()), ['*']);
 
@@ -74,19 +78,32 @@ class Factory
         $this->app->routes->add('logs', $logRoute);
         $this->app->routes->add('storeLogs', $storeLogRoute);
         $this->app->routes->add('replayLog', $replayLogRoute);
+        $this->app->routes->add('attachLogData', $attachLogDataRoute);
+        $this->app->routes->add('clearLogs', $clearLogsRoute);
+    }
+
+    protected function detectNextFreeDashboardPort($port = 4040): int
+    {
+        while (is_resource(@fsockopen('127.0.0.1', $port))) {
+            $port++;
+        }
+
+        return $port;
     }
 
     public function createHttpServer()
     {
-        $this->loop->futureTick(function () {
-            $dashboardUrl = 'http://127.0.0.1:4040/';
+        $dashboardPort = $this->detectNextFreeDashboardPort();
 
-            echo('Started Dashboard on port 4040'. PHP_EOL);
+        $this->loop->futureTick(function () use ($dashboardPort) {
+            $dashboardUrl = "http://127.0.0.1:{$dashboardPort}/";
 
-            echo('If the dashboard does not automatically open, visit: '.$dashboardUrl . PHP_EOL);
+            echo("Started Dashboard on port {$dashboardPort}" . PHP_EOL);
+
+            echo('If the dashboard does not automatically open, visit: ' . $dashboardUrl . PHP_EOL);
         });
 
-        $this->app = new App('127.0.0.1', 4040, '0.0.0.0', $this->loop);
+        $this->app = new App('127.0.0.1', $dashboardPort, '0.0.0.0', $this->loop);
 
         $this->addRoutes();
 

app/Commands/ServeCommand.php

@@ -5,6 +5,7 @@ namespace App\Commands;
 use App\Server\Factory;
 use Illuminate\Console\Scheduling\Schedule;
 use LaravelZero\Framework\Commands\Command;
+use React\EventLoop\LoopInterface;
 
 class ServeCommand extends Command
 {
@@ -15,6 +16,7 @@ class ServeCommand extends Command
     public function handle()
     {
         (new Factory())
+            ->setLoop(app(LoopInterface::class))
             ->setHost($this->argument('host'))
             ->setHostname($this->argument('hostname'))
             ->createServer()

app/Commands/ShareCommand.php

@@ -17,8 +17,8 @@ class ShareCommand extends Command
     {
         (new Factory())
             ->setLoop(app(LoopInterface::class))
-            //->setHost('beyond.sh')
-            //->setPort(8080)
+            ->setHost('beyond.sh')
+            ->setPort(8080)
             ->createClient($this->argument('host'), explode(',', $this->option('subdomain')))
             ->createHttpServer()
             ->run();

app/HttpServer/Controllers/AttachDataToLogController.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\HttpServer\Controllers;
+
+use Illuminate\Http\Request;
+use App\Logger\RequestLogger;
+
+class AttachDataToLogController extends PostController
+{
+    public function handle(Request $request)
+    {
+        /** @var RequestLogger $requestLogger */
+        $requestLogger = app(RequestLogger::class);
+        $loggedRequest = $requestLogger->findLoggedRequest($request->get('request_id', ''));
+
+        if (! is_null($loggedRequest)) {
+            $loggedRequest->setAdditionalData((array)$request->get('data', []));
+
+            $requestLogger->pushLogs();
+        }
+    }
+}

app/HttpServer/Controllers/ClearLogsController.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\HttpServer\Controllers;
+
+use App\Client\TunnelConnection;
+use App\HttpServer\QueryParameters;
+use App\Logger\RequestLogger;
+use GuzzleHttp\Psr7\Response;
+use Ratchet\ConnectionInterface;
+use function GuzzleHttp\Psr7\str;
+use Psr\Http\Message\RequestInterface;
+
+class ClearLogsController extends Controller
+{
+    public function onOpen(ConnectionInterface $connection, RequestInterface $request = null)
+    {
+        /** @var RequestLogger $logger */
+        $logger = app(RequestLogger::class);
+        $logger->clear();
+
+        $connection->send(
+            str(new Response(
+                200,
+                ['Content-Type' => 'application/json'],
+                ''
+            ))
+        );
+
+        $connection->close();
+    }
+}

app/HttpServer/Controllers/DashboardController.php

@@ -2,6 +2,7 @@
 
 namespace App\HttpServer\Controllers;
 
+use App\Client\Client;
 use GuzzleHttp\Psr7\Response;
 use function GuzzleHttp\Psr7\str;
 use Psr\Http\Message\RequestInterface;
@@ -15,10 +16,19 @@ class DashboardController extends Controller
             str(new Response(
                 200,
                 ['Content-Type' => 'text/html'],
-                file_get_contents(base_path('resources/views/index.html'))
+                $this->getView()
             ))
         );
 
         $connection->close();
     }
+
+    protected function getView(): string
+    {
+        $view = file_get_contents(base_path('resources/views/index.html'));
+
+        $view = str_replace('%subdomains%', implode(' ', Client::$subdomains), $view);
+
+        return $view;
+    }
 }

app/HttpServer/Controllers/PostController.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace App\HttpServer\Controllers;
+
+use App\HttpServer\QueryParameters;
+use GuzzleHttp\Psr7\ServerRequest;
+use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
+use Psr\Http\Message\RequestInterface;
+use Ratchet\ConnectionInterface;
+use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory;
+
+abstract class PostController extends Controller
+{
+    public function onOpen(ConnectionInterface $connection, RequestInterface $request = null)
+    {
+        $connection->contentLength = $this->findContentLength($request->getHeaders());
+
+        $connection->requestBuffer = (string) $request->getBody();
+
+        $connection->request = $request;
+
+        $this->checkContentLength($connection);
+    }
+
+    public function onMessage(ConnectionInterface $from, $msg)
+    {
+        $from->requestBuffer .= $msg;
+
+        $this->checkContentLength($from);
+    }
+
+    protected function findContentLength(array $headers): int
+    {
+        return Collection::make($headers)->first(function ($values, $header) {
+                return strtolower($header) === 'content-length';
+            })[0] ?? 0;
+    }
+
+    protected function checkContentLength(ConnectionInterface $connection)
+    {
+        if (strlen($connection->requestBuffer) === $connection->contentLength) {
+            $laravelRequest = $this->createLaravelRequest($connection);
+
+            $this->handle($laravelRequest);
+
+            $connection->close();
+
+            unset($connection->requestBuffer);
+            unset($connection->contentLength);
+            unset($connection->request);
+        }
+    }
+
+    abstract public function handle(Request $request);
+
+    protected function createLaravelRequest(ConnectionInterface $connection): Request
+    {
+        $serverRequest = (new ServerRequest(
+            $connection->request->getMethod(),
+            $connection->request->getUri(),
+            $connection->request->getHeaders(),
+            $connection->requestBuffer,
+            $connection->request->getProtocolVersion()
+        ))->withQueryParams(QueryParameters::create($connection->request)->all());
+
+        return Request::createFromBase((new HttpFoundationFactory)->createRequest($serverRequest));
+    }
+}

app/Logger/LoggedRequest.php

@@ -7,7 +7,9 @@ use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Laminas\Http\Request;
 use Laminas\Http\Response;
+use Namshi\Cuzzle\Formatter\CurlFormatter;
 use Riverline\MultiPartParser\StreamedPart;
+use function GuzzleHttp\Psr7\parse_request;
 
 class LoggedRequest implements \JsonSerializable
 {
@@ -35,12 +37,15 @@ class LoggedRequest implements \JsonSerializable
     /** @var string */
     protected $subdomain;
 
+    /** @var array */
+    protected $additionalData = [];
+
     public function __construct(string $rawRequest, Request $parsedRequest)
     {
-        $this->id = (string)Str::uuid();
         $this->startTime = now();
         $this->rawRequest = $rawRequest;
         $this->parsedRequest = $parsedRequest;
+        $this->id = $this->getRequestId();
     }
 
     /**
@@ -61,6 +66,8 @@ class LoggedRequest implements \JsonSerializable
                 'body' => $this->isBinary($this->rawRequest) ? 'BINARY' : $this->parsedRequest->getContent(),
                 'query' => $this->parsedRequest->getQuery()->toArray(),
                 'post' => $this->getPost(),
+                'curl' => (new CurlFormatter())->format(parse_request($this->rawRequest)),
+                'additional_data' => $this->additionalData,
             ],
         ];
 
@@ -77,6 +84,11 @@ class LoggedRequest implements \JsonSerializable
         return $data;
     }
 
+    public function setAdditionalData(array $data)
+    {
+        $this->additionalData = array_merge($this->additionalData, $data);
+    }
+
     protected function isBinary(string $string): bool
     {
         return preg_match('~[^\x20-\x7E\t\r\n]~', $string) > 0;
@@ -174,4 +186,9 @@ class LoggedRequest implements \JsonSerializable
     {
         return Arr::get($this->parsedRequest->getHeaders()->toArray(), 'X-Original-Host');
     }
+
+    protected function getRequestId()
+    {
+        return Arr::get($this->parsedRequest->getHeaders()->toArray(), 'X-Expose-Request-ID', (string)Str::uuid());
+    }
 }

app/Logger/RequestLogger.php

@@ -51,7 +51,14 @@ class RequestLogger
         return $this->requests;
     }
 
-    protected function pushLogs()
+    public function clear()
+    {
+        $this->requests = [];
+
+        $this->pushLogs();
+    }
+
+    public function pushLogs()
     {
         $this
             ->client

app/Providers/AppServiceProvider.php

@@ -23,6 +23,7 @@ class AppServiceProvider extends ServiceProvider
 
         $this->app->singleton(RequestLogger::class, function () {
             $browser = new Browser(app(LoopInterface::class));
+
             return new RequestLogger($browser);
         });
     }

app/Server/Connections/Connection.php

@@ -32,14 +32,17 @@ class Connection
         return array_pop($this->proxies);
     }
 
-    public function rewriteHostInformation($serverHost, $port, string $data)
+    public function rewriteHostInformation($serverHost, $port, $requestId, string $data)
     {
         $appName = config('app.name');
         $appVersion = config('app.version');
 
+        $originalHost = "{$this->subdomain}.{$serverHost}:{$port}";
+
         $data = preg_replace('/Host: '.$this->subdomain.'.'.$serverHost.'(.*)\r\n/', "Host: {$this->host}\r\n" .
-            "X-Tunnel-By: {$appName} {$appVersion}\r\n" .
-            "X-Original-Host: {$this->subdomain}.{$serverHost}:{$port}\r\n", $data);
+            "X-Exposed-By: {$appName} {$appVersion}\r\n" .
+            "X-Expose-Request-ID: {$requestId}\r\n" .
+            "X-Original-Host: {$originalHost}\r\n", $data);
 
         return $data;
     }

app/Server/Expose.php

@@ -10,7 +10,7 @@ use Ratchet\ConnectionInterface;
 use Ratchet\MessageComponentInterface;
 use function GuzzleHttp\Psr7\parse_request;
 
-class Shaft implements MessageComponentInterface
+class Expose implements MessageComponentInterface
 {
     protected $connectionManager;
 

app/Server/Factory.php

@@ -60,7 +60,7 @@ class Factory
 
         $connectionManager = new ConnectionManager($this->hostname, $this->port);
 
-        $app = new Shaft($connectionManager);
+        $app = new Expose($connectionManager);
 
         return new IoServer($app, $socket, $this->loop);
     }

app/Server/Messages/ControlMessage.php

@@ -5,6 +5,7 @@ namespace App\Server\Messages;
 use App\Server\Connections\ConnectionManager;
 use Illuminate\Support\Str;
 use Ratchet\ConnectionInterface;
+use React\EventLoop\LoopInterface;
 use stdClass;
 
 class ControlMessage implements Message
@@ -45,6 +46,13 @@ class ControlMessage implements Message
             'subdomain' => $connectionInfo->subdomain,
             'client_id' => $connectionInfo->client_id
         ]));
+
+        $loop = app(LoopInterface::class);
+        $timer = $loop->addPeriodicTimer(5, function () use ($connection) {
+            $connection->send(json_encode([
+                'event' => 'ping'
+            ]));
+        });
     }
 
     protected function registerProxy(ConnectionInterface $connection, $data)

app/Server/Messages/TunnelMessage.php

@@ -69,10 +69,10 @@ class TunnelMessage implements Message
 
     private function copyDataToClient(Connection $clientConnection)
     {
-        $data = $clientConnection->rewriteHostInformation($this->connectionManager->host(), $this->connectionManager->port(), $this->connection->buffer);
-
         $requestId = uniqid();
 
+        $data = $clientConnection->rewriteHostInformation($this->connectionManager->host(), $this->connectionManager->port(), $requestId, $this->connection->buffer);
+
         // Ask client to create a new proxy
         $clientConnection->socket->send(json_encode([
                 'event' => 'createProxy',