Fix some issues preventing PR to work

beyondcode · Jul 21, 2024 · f92eabc · f92eabc
1 parent 28308ab
commit f92eabc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/app/Client/Http/HttpClient.php b/app/Client/Http/HttpClient.php
@@ -54,7 +54,7 @@ public function performRequest(string $requestData, WebSocket $proxyConnection =
 
         $request = $this->passRequestThroughModifiers(parse_request($requestData), $proxyConnection);
 
-        transform($request, function ($request) use ($proxyConnection) {
+        return transform($request, function ($request) use ($proxyConnection) {
             return $this->sendRequestToApplication($request, $proxyConnection);
         });
     }

diff --git a/app/Client/ProxyManager.php b/app/Client/ProxyManager.php
@@ -36,8 +36,6 @@ public function createProxy(string $clientId, $connectionData)
                 $localRequestConnection = null;
 
                 $proxyConnection->on('message', function ($message) use (&$localRequestConnection, $proxyConnection, $connectionData) {
-                    $this->performRequest($proxyConnection, (string) $message, $connectionData);
-
                     if ($localRequestConnection) {
                         $localRequestConnection->write($message);
                         return;

diff --git a/app/Server/Http/Controllers/TunnelMessageController.php b/app/Server/Http/Controllers/TunnelMessageController.php
@@ -91,8 +91,8 @@ protected function sendRequestToClient(Request $request, ControlConnection $cont
 
         $httpConnection = $this->connectionManager->storeHttpConnection($httpConnection, $requestId);
 
-        transform($this->passRequestThroughModifiers($request, $httpConnection), function (Request $request) use ($controlConnection, $requestId) {
-            $controlConnection->once('proxy_ready_'.$requestId, function (ConnectionInterface $proxy) use ($request) {
+        transform($this->passRequestThroughModifiers($request, $httpConnection), function (Request $request) use ($httpConnection, $controlConnection, $requestId) {
+            $controlConnection->once('proxy_ready_'.$requestId, function (ConnectionInterface $proxy) use ($httpConnection, $request) {
                 // Convert the Laravel request into a PSR7 request
                 $psr17Factory = new Psr17Factory();
                 $psrHttpFactory = new PsrHttpFactory($psr17Factory, $psr17Factory, $psr17Factory, $psr17Factory);