feat: enable http compression by sending data not with chunked encodi… (

#691) * feat: enable http compression by sending data not with chunked encoding - if possible * Update SwooleClient.php --------- Co-authored-by: Taylor Otwell <[email protected]>
laravel · May 4, 2023 · 2568cc3 · 2568cc3
1 parent f827cc8
commit 2568cc3
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 5 deletions.
diff --git a/src/Swoole/SwooleClient.php b/src/Swoole/SwooleClient.php
@@ -261,11 +261,13 @@ protected function sendResponseContent(OctaneResponse $octaneResponse, SwooleRes
         }
 
         if ($length <= $this->chunkSize) {
-            $swooleResponse->write($content);
-        } else {
-            for ($offset = 0; $offset < $length; $offset += $this->chunkSize) {
-                $swooleResponse->write(substr($content, $offset, $this->chunkSize));
-            }
+            $swooleResponse->end($content);
+
+            return;
+        }
+
+        for ($offset = 0; $offset < $length; $offset += $this->chunkSize) {
+            $swooleResponse->write(substr($content, $offset, $this->chunkSize));
         }
 
         $swooleResponse->end();

diff --git a/tests/SwooleClientTest.php b/tests/SwooleClientTest.php
@@ -9,6 +9,7 @@
 use Laravel\Octane\RequestContext;
 use Laravel\Octane\Swoole\SwooleClient;
 use Mockery;
+use Swoole\Http\Response as SwooleResponse;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class SwooleClientTest extends TestCase
@@ -280,4 +281,47 @@ public function test_error_method_sends_detailed_error_response_to_swoole_in_deb
         $swooleResponse->shouldHaveReceived('header')->with('Content-Type', 'text/plain');
         $swooleResponse->shouldHaveReceived('end')->with((string) $e);
     }
+
+    /** @doesNotPerformAssertions @test */
+    public function test_respond_method_send_not_chunked_response_to_swoole(): void
+    {
+        $client = new SwooleClient;
+
+        $swooleResponse = Mockery::mock(SwooleResponse::class);
+
+        $swooleResponse->shouldReceive('status')->once()->with(200);
+        $swooleResponse->shouldReceive('header')->once()->with('Cache-Control', 'no-cache, private');
+        $swooleResponse->shouldReceive('header')->once()->with('Content-Type', 'text/html');
+        $swooleResponse->shouldReceive('header')->once()->with('Date', Mockery::type('string'));
+        $swooleResponse->shouldReceive('write')->never();
+        $swooleResponse->shouldReceive('end')->once()->with('Hello World');
+
+        $response = new Response('Hello World', 200, ['Content-Type' => 'text/html']);
+
+        $client->respond(new RequestContext([
+            'swooleResponse' => $swooleResponse,
+        ]), new OctaneResponse($response));
+    }
+
+    /** @doesNotPerformAssertions @test */
+    public function test_respond_method_send_chunked_response_to_swoole(): void
+    {
+        $client = new SwooleClient(6);
+
+        $swooleResponse = Mockery::mock('Swoole\Http\Response');
+
+        $swooleResponse->shouldReceive('status')->once()->with(200);
+        $swooleResponse->shouldReceive('header')->once()->with('Cache-Control', 'no-cache, private');
+        $swooleResponse->shouldReceive('header')->once()->with('Content-Type', 'text/html');
+        $swooleResponse->shouldReceive('header')->once()->with('Date', Mockery::type('string'));
+        $swooleResponse->shouldReceive('write')->once()->with('Hello ');
+        $swooleResponse->shouldReceive('write')->once()->with('World');
+        $swooleResponse->shouldReceive('end')->once();
+
+        $response = new Response('Hello World', 200, ['Content-Type' => 'text/html']);
+
+        $client->respond(new RequestContext([
+            'swooleResponse' => $swooleResponse,
+        ]), new OctaneResponse($response));
+    }
 }