CHANGELOG.md

@@ -1,6 +1,17 @@
 # Release Notes
 
-## [Unreleased](https://github.com/laravel/octane/compare/v1.0.2...1.x)
+## [Unreleased](https://github.com/laravel/octane/compare/v1.0.3...1.x)
+
+
+## [v1.0.3 (2021-06-01)](https://github.com/laravel/octane/compare/v1.0.2...v1.0.3)
+
+### Changed
+- Display memory usage ([#297](https://github.com/laravel/octane/pull/297), [#304](https://github.com/laravel/octane/pull/304))
+
+### Fixed 
+- Fixes issue related to changing non-standard HTTP status codes to 200 OK ([#294](https://github.com/laravel/octane/pull/294))
+- Give new application instance to database session handler ([#302](https://github.com/laravel/octane/pull/302))
+- Adds SameSite attribute for cookies ([#299](https://github.com/laravel/octane/pull/299))
 
 
 ## [v1.0.2 (2021-05-25)](https://github.com/laravel/octane/compare/v1.0.1...v1.0.2)

src/Commands/Concerns/InteractsWithIO.php

@@ -94,21 +94,24 @@ public function requestInfo($request, $verbosity = null)
         $terminalWidth = $this->getTerminalWidth();
 
         $url = parse_url($request['url'], PHP_URL_PATH) ?: '/';
-
         $duration = number_format(round($request['duration'], 2), 2, '.', '');
 
+        $memory = isset($request['memory'])
+            ? (number_format($request['memory'] / 1024 / 1204, 2, '.', '').' mb ')
+            : '';
+
         ['method' => $method, 'statusCode' => $statusCode] = $request;
 
-        $dots = str_repeat('.', max($terminalWidth - strlen($method.$url.$duration) - 16, 0));
+        $dots = str_repeat('.', max($terminalWidth - strlen($method.$url.$duration.$memory) - 16, 0));
 
         if (empty($dots) && ! $this->output->isVerbose()) {
-            $url = substr($url, 0, $terminalWidth - strlen($method.$duration) - 15 - 3).'...';
+            $url = substr($url, 0, $terminalWidth - strlen($method.$duration.$memory) - 15 - 3).'...';
         } else {
             $dots .= ' ';
         }
 
         $this->output->writeln(sprintf(
-           '  <fg=%s;options=bold>%s </>   <fg=cyan;options=bold>%s</> <options=bold>%s</><fg=#6C7280> %s%s ms</>',
+           '  <fg=%s;options=bold>%s </>   <fg=cyan;options=bold>%s</> <options=bold>%s</><fg=#6C7280> %s%s%s ms</>',
             match (true) {
                 $statusCode >= 500 => 'red',
                 $statusCode >= 400 => 'yellow',
@@ -120,6 +123,7 @@ public function requestInfo($request, $verbosity = null)
            $method,
            $url,
            $dots,
+           $memory,
            $duration,
         ), $this->parseVerbosity($verbosity));
     }

src/Concerns/ProvidesDefaultConfigurationOptions.php

@@ -35,6 +35,7 @@ public static function prepareApplicationForNextOperation(): array
             \Laravel\Octane\Listeners\GiveNewApplicationInstanceToAuthorizationGate::class,
             \Laravel\Octane\Listeners\GiveNewApplicationInstanceToBroadcastManager::class,
             \Laravel\Octane\Listeners\GiveNewApplicationInstanceToDatabaseManager::class,
+            \Laravel\Octane\Listeners\GiveNewApplicationInstanceToDatabaseSessionHandler::class,
             \Laravel\Octane\Listeners\GiveNewApplicationInstanceToHttpKernel::class,
             \Laravel\Octane\Listeners\GiveNewApplicationInstanceToMailManager::class,
             \Laravel\Octane\Listeners\GiveNewApplicationInstanceToNotificationChannelManager::class,

src/Listeners/GiveNewApplicationInstanceToDatabaseSessionHandler.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Laravel\Octane\Listeners;
+
+use Illuminate\Session\DatabaseSessionHandler;
+
+class GiveNewApplicationInstanceToDatabaseSessionHandler
+{
+    /**
+     * Handle the event.
+     *
+     * @param  mixed  $event
+     * @return void
+     */
+    public function handle($event): void
+    {
+        $handler = $event->sandbox->make('session')->driver()->getHandler();
+
+        if (! $handler instanceof DatabaseSessionHandler ||
+            ! method_exists($handler, 'setContainer')) {
+            return;
+        }
+
+        $handler->setContainer($event->sandbox);
+    }
+}

src/Stream.php

@@ -21,6 +21,7 @@ public static function request(string $method, string $url, int $statusCode, flo
             'type' => 'request',
             'method' => $method,
             'url' => $url,
+            'memory' => memory_get_usage(),
             'statusCode' => $statusCode,
             'duration' => $duration,
         ])."\n");

src/Swoole/SwooleClient.php

@@ -19,6 +19,10 @@
 
 class SwooleClient implements Client, ServesStaticFiles
 {
+    const STATUS_CODE_REASONS = [
+        419 => 'Page Expired',
+    ];
+
     public function __construct(protected int $chunkSize = 1048576)
     {
     }
@@ -41,7 +45,7 @@ public function marshalRequest(RequestContext $context): array
     }
 
     /**
-     * Detemrine if the request can be served as a static file.
+     * Determine if the request can be served as a static file.
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  \Laravel\Octane\RequestContext  $context
@@ -176,7 +180,11 @@ public function sendResponseHeaders(Response $response, SwooleResponse $swooleRe
             }
         }
 
-        $swooleResponse->status($response->getStatusCode());
+        if (! is_null($reason = $this->getReasonFromStatusCode($response->getStatusCode()))) {
+            $swooleResponse->status($response->getStatusCode(), $reason);
+        } else {
+            $swooleResponse->status($response->getStatusCode());
+        }
 
         foreach ($response->headers->getCookies() as $cookie) {
             $swooleResponse->{$cookie->isRaw() ? 'rawcookie' : 'cookie'}(
@@ -186,7 +194,8 @@ public function sendResponseHeaders(Response $response, SwooleResponse $swooleRe
                 $cookie->getPath(),
                 $cookie->getDomain(),
                 $cookie->isSecure(),
-                $cookie->isHttpOnly()
+                $cookie->isHttpOnly(),
+                $cookie->getSameSite()
             );
         }
     }
@@ -265,4 +274,19 @@ public function error(Throwable $e, Application $app, Request $request, RequestC
             Octane::formatExceptionForClient($e, $app->make('config')->get('app.debug'))
         );
     }
+
+    /**
+     * Get the HTTP reason clause for non-standard status codes.
+     *
+     * @param  int  $code
+     * @return string|null
+     */
+    protected function getReasonFromStatusCode(int $code): ?string
+    {
+        if (array_key_exists($code, self::STATUS_CODE_REASONS)) {
+            return self::STATUS_CODE_REASONS[$code];
+        }
+
+        return null;
+    }
 }

tests/CommandTest.php

@@ -54,27 +54,30 @@ public function test_request()
             'method' => 'GET',
             'url' => 'http://127.0.0.1/welcome',
             'statusCode' => '200',
+            'memory' => 17393560,
             'duration' => 10,
         ]);
 
         $command->requestInfo([
             'method' => 'POST',
             'url' => 'http://127.0.0.1:8080',
             'statusCode' => '404',
+            'memory' => 20393560,
             'duration' => 1234,
         ]);
 
         $command->requestInfo([
             'method' => 'POST',
             'url' => 'http://127.0.0.1:8080/'.str_repeat('foo', 100),
             'statusCode' => 500,
+            'memory' => 30393560,
             'duration' => 4567854,
         ]);
 
         $this->assertEquals(<<<'EOF'
-  200    GET /welcome .................. 10.00 ms
-  404    POST / ...................... 1234.00 ms
-  500    POST /foofoofoofoofoofo... 4567854.00 ms
+  200    GET /welcome ......... 14.11 mb 10.00 ms
+  404    POST / ............. 16.54 mb 1234.00 ms
+  500    POST /foofoofo... 24.65 mb 4567854.00 ms
 
 EOF, $output->fetch());
     }

tests/SwooleClientTest.php

@@ -181,6 +181,25 @@ public function test_respond_method_send_streamed_response_to_swoole()
         }, 200, ['Content-Type' => 'text/html'])));
     }
 
+    /** @doesNotPerformAssertions @test */
+    public function test_respond_method_with_laravel_specific_status_code_sends_response_to_swoole()
+    {
+        $client = new SwooleClient;
+
+        $swooleResponse = Mockery::mock('Swoole\Http\Response');
+
+        $swooleResponse->shouldReceive('status')->once()->with(419, 'Page Expired');
+        $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')->with('Hello World');
+        $swooleResponse->shouldReceive('end')->once();
+
+        $client->respond(new RequestContext([
+            'swooleResponse' => $swooleResponse,
+        ]), new OctaneResponse(new Response('Hello World', 419, ['Content-Type' => 'text/html'])));
+    }
+
     /** @doesNotPerformAssertions @test */
     public function test_error_method_sends_error_response_to_swoole()
     {