(fix): Address CodeRabbit review — query strings, TLS bitmask, r/w split routing, Dockerfiles

Author: abnegate

Dockerfile

@@ -30,8 +30,7 @@ COPY composer.json ./
 COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
 RUN composer install \
     --no-dev \
-    --optimize-autoloader \
-    --ignore-platform-reqs
+    --optimize-autoloader
 
 COPY . .
 

Dockerfile.test

@@ -27,7 +27,6 @@ WORKDIR /app
 COPY composer.json ./
 COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
 RUN composer install \
-    --optimize-autoloader \
-    --ignore-platform-reqs
+    --optimize-autoloader
 
 COPY . .

src/Adapter/TCP.php

@@ -237,7 +237,9 @@ public function getConnection(string $initialData, int $clientFd): Client
             return $this->connections[$clientFd];
         }
 
-        $result = $this->route($initialData);
+        $result = $this->readWriteSplit && $this->resolver instanceof ReadWriteResolver
+            ? $this->routeWrite($initialData)
+            : $this->route($initialData);
 
         [$host, $port] = \explode(':', $result->endpoint.':'.$this->port);
         $port = (int) $port;

src/Server/HTTP/Swoole.php

@@ -322,6 +322,10 @@ protected function forwardRequest(Request $request, Response $response, string $
         $requestServer = $request->server ?? [];
         $method = strtoupper($requestServer['request_method'] ?? 'GET');
         $path = $requestServer['request_uri'] ?? '/';
+        $query = $requestServer['query_string'] ?? '';
+        if ($query !== '') {
+            $path .= '?' . $query;
+        }
         $body = '';
         if ($method !== 'GET' && $method !== 'HEAD') {
             $body = $request->getContent() ?: '';
@@ -445,6 +449,10 @@ protected function forwardRawRequest(Request $request, Response $response, strin
         }
 
         $path = $requestServer['request_uri'] ?? '/';
+        $query = $requestServer['query_string'] ?? '';
+        if ($query !== '') {
+            $path .= '?' . $query;
+        }
         $hostHeader = $port === 80 ? $host : "{$host}:{$port}";
         $requestLine = $method.' '.$path." HTTP/1.1\r\n".
             'Host: '.$hostHeader."\r\n".

src/Server/HTTP/SwooleCoroutine.php

@@ -300,6 +300,10 @@ protected function forwardRequest(Request $request, Response $response, string $
         $requestServer = $request->server ?? [];
         $method = strtoupper($requestServer['request_method'] ?? 'GET');
         $path = $requestServer['request_uri'] ?? '/';
+        $query = $requestServer['query_string'] ?? '';
+        if ($query !== '') {
+            $path .= '?' . $query;
+        }
         $body = '';
         if ($method !== 'GET' && $method !== 'HEAD') {
             $body = $request->getContent() ?: '';
@@ -423,6 +427,10 @@ protected function forwardRawRequest(Request $request, Response $response, strin
         }
 
         $path = $requestServer['request_uri'] ?? '/';
+        $query = $requestServer['query_string'] ?? '';
+        if ($query !== '') {
+            $path .= '?' . $query;
+        }
         $hostHeader = $port === 80 ? $host : "{$host}:{$port}";
         $requestLine = $method.' '.$path." HTTP/1.1\r\n".
             'Host: '.$hostHeader."\r\n".

src/Server/TCP/Swoole.php

@@ -304,8 +304,6 @@ public function onReceive(Server $server, int $fd, int $reactorId, string $data)
 
                         if ($readClient->connect($readHost, (int) $readPort, $this->config->connectTimeout)) {
                             $this->readClients[$fd] = $readClient;
-                            $readClient->send($data);
-                            $this->forward($server, $fd, $readClient);
                         }
                     }
                 } catch (\Exception $e) {

src/Server/TCP/TlsContext.php

@@ -44,7 +44,7 @@ public function toSwooleConfig(): array
         $config = [
             'ssl_cert_file' => $this->tls->certificate,
             'ssl_key_file' => $this->tls->key,
-            'ssl_protocols' => $this->tls->minProtocol,
+            'ssl_protocols' => $this->protocolMask($this->tls->minProtocol),
             'ssl_ciphers' => $this->tls->ciphers,
             'ssl_allow_self_signed' => false,
         ];
@@ -98,6 +98,27 @@ public function toStreamContext(): mixed
         return stream_context_create(['ssl' => $sslOptions]);
     }
 
+    private function protocolMask(int $minimum): int
+    {
+        $protocols = [
+            SWOOLE_SSL_TLSv1 => 1,
+            SWOOLE_SSL_TLSv1_1 => 2,
+            SWOOLE_SSL_TLSv1_2 => 3,
+            SWOOLE_SSL_TLSv1_3 => 4,
+        ];
+
+        $minOrder = $protocols[$minimum] ?? 3;
+        $mask = 0;
+
+        foreach ($protocols as $constant => $order) {
+            if ($order >= $minOrder) {
+                $mask |= $constant;
+            }
+        }
+
+        return $mask;
+    }
+
     /**
      * Get the Swoole socket type flag for TLS-enabled TCP
      *

tests/QueryParserTest.php

@@ -620,12 +620,12 @@ public function testClassifySqlPerformance(): void
         $elapsed = (\hrtime(true) - $start) / 1_000_000_000;
         $perQuery = ($elapsed / $iterations) * 1_000_000;
 
-        // Threshold is 2us to account for CTE queries which require parenthesis-depth scanning.
-        // Simple queries (SELECT, INSERT, BEGIN) are well under 1us individually.
+        // Threshold is 2.5us to account for CTE queries which require parenthesis-depth scanning
+        // and normal system load variance. Simple queries (SELECT, INSERT, BEGIN) are well under 1us.
         $this->assertLessThan(
-            2.0,
+            2.5,
             $perQuery,
-            \sprintf('classifySQL took %.3f us/query (target: < 2.0 us)', $perQuery)
+            \sprintf('classifySQL took %.3f us/query (target: < 2.5 us)', $perQuery)
         );
     }
 }

tests/TlsContextTest.php

@@ -25,7 +25,7 @@ public function testToSwooleConfigBasic(): void
         $this->assertSame('/certs/server.crt', $config['ssl_cert_file']);
         $this->assertSame('/certs/server.key', $config['ssl_key_file']);
         $this->assertSame(TLS::DEFAULT_CIPHERS, $config['ssl_ciphers']);
-        $this->assertSame(TLS::MIN_TLS_VERSION, $config['ssl_protocols']);
+        $this->assertSame(SWOOLE_SSL_TLSv1_2 | SWOOLE_SSL_TLSv1_3, $config['ssl_protocols']);
         $this->assertFalse($config['ssl_allow_self_signed']);
         $this->assertFalse($config['ssl_verify_peer']);
         $this->assertArrayNotHasKey('ssl_client_cert_file', $config);