wip

app/Server/Factory.php

@@ -10,11 +10,14 @@ use App\Http\Server as HttpServer;
 use App\Server\Connections\ConnectionManager;
 use App\Server\Http\Controllers\Admin\DeleteUsersController;
 use App\Server\Http\Controllers\Admin\DisconnectSiteController;
+use App\Server\Http\Controllers\Admin\DisconnectTcpConnectionController;
 use App\Server\Http\Controllers\Admin\GetSettingsController;
 use App\Server\Http\Controllers\Admin\GetSitesController;
+use App\Server\Http\Controllers\Admin\GetTcpConnectionsController;
 use App\Server\Http\Controllers\Admin\GetUserDetailsController;
 use App\Server\Http\Controllers\Admin\GetUsersController;
 use App\Server\Http\Controllers\Admin\ListSitesController;
+use App\Server\Http\Controllers\Admin\ListTcpConnectionsController;
 use App\Server\Http\Controllers\Admin\ListUsersController;
 use App\Server\Http\Controllers\Admin\RedirectToUsersController;
 use App\Server\Http\Controllers\Admin\ShowSettingsController;
@@ -120,6 +123,7 @@ class Factory
         $this->router->get('/users', ListUsersController::class, $adminCondition);
         $this->router->get('/settings', ShowSettingsController::class, $adminCondition);
         $this->router->get('/sites', ListSitesController::class, $adminCondition);
+        $this->router->get('/tcp', ListTcpConnectionsController::class, $adminCondition);
 
         $this->router->get('/api/settings', GetSettingsController::class, $adminCondition);
         $this->router->post('/api/settings', StoreSettingsController::class, $adminCondition);
@@ -129,6 +133,8 @@ class Factory
         $this->router->delete('/api/users/{id}', DeleteUsersController::class, $adminCondition);
         $this->router->get('/api/sites', GetSitesController::class, $adminCondition);
         $this->router->delete('/api/sites/{id}', DisconnectSiteController::class, $adminCondition);
+        $this->router->get('/api/tcp', GetTcpConnectionsController::class, $adminCondition);
+        $this->router->delete('/api/tcp/{id}', DisconnectTcpConnectionController::class, $adminCondition);
     }
 
     protected function bindConfiguration()

app/Server/Http/Controllers/Admin/DisconnectTcpConnectionController.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Server\Http\Controllers\Admin;
+
+use App\Contracts\ConnectionManager;
+use App\Server\Configuration;
+use App\Server\Connections\TcpControlConnection;
+use Illuminate\Http\Request;
+use Ratchet\ConnectionInterface;
+
+class DisconnectTcpConnectionController extends AdminController
+{
+    /** @var ConnectionManager */
+    protected $connectionManager;
+
+    /** @var Configuration */
+    protected $configuration;
+
+    public function __construct(ConnectionManager $connectionManager)
+    {
+        $this->connectionManager = $connectionManager;
+    }
+
+    public function handle(Request $request, ConnectionInterface $httpConnection)
+    {
+        $connection = $this->connectionManager->findControlConnectionForClientId($request->get('id'));
+
+        if (! is_null($connection)) {
+            $connection->close();
+
+            $this->connectionManager->removeControlConnection($connection);
+        }
+
+        $httpConnection->send(respond_json([
+            'tcp_connections' => collect($this->connectionManager->getConnections())
+                ->filter(function ($connection) {
+                    return get_class($connection) === TcpControlConnection::class;
+                })
+                ->values(),
+        ]));
+    }
+}

app/Server/Http/Controllers/Admin/GetSitesController.php

@@ -4,6 +4,7 @@ namespace App\Server\Http\Controllers\Admin;
 
 use App\Contracts\ConnectionManager;
 use App\Server\Configuration;
+use App\Server\Connections\ControlConnection;
 use Illuminate\Http\Request;
 use Ratchet\ConnectionInterface;
 
@@ -23,7 +24,11 @@ class GetSitesController extends AdminController
     {
         $httpConnection->send(
             respond_json([
-                'sites' => collect($this->connectionManager->getConnections())->map(function ($site, $siteId) {
+                'sites' => collect($this->connectionManager->getConnections())
+                    ->filter(function ($connection) {
+                        return get_class($connection) === ControlConnection::class;
+                    })
+                    ->map(function ($site, $siteId) {
                     $site = $site->toArray();
                     $site['id'] = $siteId;
 

app/Server/Http/Controllers/Admin/GetTcpConnectionsController.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Server\Http\Controllers\Admin;
+
+use App\Contracts\ConnectionManager;
+use App\Server\Configuration;
+use App\Server\Connections\TcpControlConnection;
+use Illuminate\Http\Request;
+use Ratchet\ConnectionInterface;
+
+class GetTcpConnectionsController extends AdminController
+{
+    /** @var ConnectionManager */
+    protected $connectionManager;
+    /** @var Configuration */
+    protected $configuration;
+
+    public function __construct(ConnectionManager $connectionManager, Configuration $configuration)
+    {
+        $this->connectionManager = $connectionManager;
+    }
+
+    public function handle(Request $request, ConnectionInterface $httpConnection)
+    {
+        $httpConnection->send(
+            respond_json([
+                'tcp_connections' => collect($this->connectionManager->getConnections())
+                    ->filter(function ($connection) {
+                        return get_class($connection) === TcpControlConnection::class;
+                    })
+                    ->map(function ($site, $siteId) {
+                        $site = $site->toArray();
+                        $site['id'] = $siteId;
+
+                        return $site;
+                    })
+                    ->values(),
+            ])
+        );
+    }
+}

app/Server/Http/Controllers/Admin/ListSitesController.php

@@ -4,6 +4,7 @@ namespace App\Server\Http\Controllers\Admin;
 
 use App\Contracts\ConnectionManager;
 use App\Server\Configuration;
+use App\Server\Connections\ControlConnection;
 use Illuminate\Http\Request;
 use Ratchet\ConnectionInterface;
 
@@ -25,12 +26,17 @@ class ListSitesController extends AdminController
         $sites = $this->getView($httpConnection, 'server.sites.index', [
             'scheme' => $this->configuration->port() === 443 ? 'https' : 'http',
             'configuration' => $this->configuration,
-            'sites' => collect($this->connectionManager->getConnections())->map(function ($site, $siteId) {
+            'sites' => collect($this->connectionManager->getConnections())
-                $site = $site->toArray();
+                ->filter(function ($connection) {
-                $site['id'] = $siteId;
+                    return get_class($connection) === ControlConnection::class;
+                })
+                ->map(function ($site, $siteId) {
+                    $site = $site->toArray();
+                    $site['id'] = $siteId;
 
-                return $site;
+                    return $site;
-            })->values(),
+                })
+                ->values(),
         ]);
 
         $httpConnection->send(

app/Server/Http/Controllers/Admin/ListTcpConnectionsController.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Server\Http\Controllers\Admin;
+
+use App\Contracts\ConnectionManager;
+use App\Server\Configuration;
+use App\Server\Connections\TcpControlConnection;
+use Illuminate\Http\Request;
+use Ratchet\ConnectionInterface;
+
+class ListTcpConnectionsController extends AdminController
+{
+    /** @var ConnectionManager */
+    protected $connectionManager;
+    /** @var Configuration */
+    protected $configuration;
+
+    public function __construct(ConnectionManager $connectionManager, Configuration $configuration)
+    {
+        $this->connectionManager = $connectionManager;
+        $this->configuration = $configuration;
+    }
+
+    public function handle(Request $request, ConnectionInterface $httpConnection)
+    {
+        $sites = $this->getView($httpConnection, 'server.tcp.index', [
+            'scheme' => $this->configuration->port() === 443 ? 'https' : 'http',
+            'configuration' => $this->configuration,
+            'connections' => collect($this->connectionManager->getConnections())
+                ->filter(function ($connection) {
+                    return get_class($connection) === TcpControlConnection::class;
+                })
+                ->map(function ($connection, $connectionId) {
+                    $connection = $connection->toArray();
+                    $connection['id'] = $connectionId;
+
+                    return $connection;
+                })
+                ->values(),
+        ]);
+
+        $httpConnection->send(
+            respond_html($sites)
+        );
+    }
+}

resources/views/server/layouts/app.twig

@@ -27,6 +27,12 @@
                            ml-8 inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium leading-5 focus:outline-none transition duration-150 ease-in-out">
                             Shared sites
                         </a>
+                        <a href="/tcp"
+                           class="
+                           {% if request.is('tcp') %} border-indigo-500 focus:border-indigo-700 text-gray-900 {% else %} border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300 focus:text-gray-700 focus:border-gray-300{% endif %}
+                           ml-8 inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium leading-5 focus:outline-none transition duration-150 ease-in-out">
+                            TCP connections
+                        </a>
                         <a href="/settings"
                            class="
                            {% if request.is('settings') %} border-indigo-500 focus:border-indigo-700 text-gray-900 {% else %} border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300 focus:text-gray-700 focus:border-gray-300{% endif %}

resources/views/server/tcp/index.twig

@@ -0,0 +1,73 @@
+{% extends "app" %}
+{% block title %}TCP Connections{% endblock %}
+{% block content %}
+    <div class="flex flex-col py-8">
+        <div class="-my-2 py-2 overflow-x-auto sm:-mx-6 sm:px-6 lg:-mx-8 lg:px-8">
+            <div
+                class="align-middle inline-block min-w-full shadow overflow-hidden sm:rounded-lg border-b border-gray-200">
+                <table class="min-w-full" v-if="connections.length > 0">
+                    <thead>
+                    <tr>
+                        <th class="px-6 py-3 border-b border-gray-200 bg-gray-50 text-left text-xs leading-4 font-medium text-gray-500 uppercase tracking-wider">
+                            Local Port
+                        </th>
+                        <th class="px-6 py-3 border-b border-gray-200 bg-gray-50 text-left text-xs leading-4 font-medium text-gray-500 uppercase tracking-wider">
+                            Expose Port
+                        </th>
+                        <th class="px-6 py-3 border-b border-gray-200 bg-gray-50 text-left text-xs leading-4 font-medium text-gray-500 uppercase tracking-wider">
+                            Shared At
+                        </th>
+                        <th class="px-6 py-3 border-b border-gray-200 bg-gray-50"></th>
+                    </tr>
+                    </thead>
+                    <tbody class="bg-white">
+                        <tr v-for="connection in connections">
+                            <td class="px-6 py-4 whitespace-no-wrap border-b border-gray-200 text-sm leading-5 font-medium text-gray-900">
+                                @{ connection.port }
+                            </td>
+                            <td class="px-6 py-4 whitespace-no-wrap border-b border-gray-200 text-sm leading-5 text-gray-500">
+                                @{ connection.shared_port }
+                            </td>
+                            <td class="px-6 py-4 whitespace-no-wrap border-b border-gray-200 text-sm leading-5 text-gray-500">
+                                @{ connection.shared_at }
+                            </td>
+                            <td class="px-6 py-4 whitespace-no-wrap text-right border-b border-gray-200 text-sm leading-5 font-medium">
+                                <a href="#"
+                                   @click.prevent="disconnectConnection(connection.client_id)"
+                                   class="pl-2 text-red-600 hover:text-red-900">Disconnect</a>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+                <div class="flex items-center justify-center text-gray-900 p-4" v-else>
+                    <span class="text-xl">There are no TCP connections shared with this server yet.</span>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}
+{% block scripts %}
+    <script>
+        new Vue({
+            el: '#app',
+
+            delimiters: ['@{', '}'],
+
+            data: {
+                connections: {{ connections|json_encode|raw }}
+            },
+
+            methods: {
+                disconnectConnection(id) {
+                    fetch('/api/tcp/' + id, {
+                        method: 'DELETE',
+                    }).then((response) => {
+                        return response.json();
+                    }).then((data) => {
+                        this.connections = data.connections;
+                    });
+                }
+            }
+        })
+    </script>
+{% endblock %}

resources/views/server/users/index.twig

@@ -92,6 +92,9 @@
                     <th class="px-6 py-3 border-b border-gray-200 bg-gray-50 text-left text-xs leading-4 font-medium text-gray-500 uppercase tracking-wider">
                         Custom Subdomains
                     </th>
+                    <th class="px-6 py-3 border-b border-gray-200 bg-gray-50 text-left text-xs leading-4 font-medium text-gray-500 uppercase tracking-wider">
+                        TCP ports
+                    </th>
                     <th class="px-6 py-3 border-b border-gray-200 bg-gray-50 text-left text-xs leading-4 font-medium text-gray-500 uppercase tracking-wider">
                         Created At
                     </th>
@@ -114,6 +117,14 @@
                             Yes
                         </span>
                     </td>
+                    <td class="px-6 py-4 whitespace-no-wrap border-b border-gray-200 text-sm leading-5 text-gray-500">
+                        <span v-if="user.can_share_tcp_ports === 0">
+                            No
+                        </span>
+                        <span v-else>
+                            Yes
+                        </span>
+                    </td>
                     <td class="px-6 py-4 whitespace-no-wrap border-b border-gray-200 text-sm leading-5 text-gray-500">
                         @{ user.created_at }
                     </td>