closer to swoole

Author: ChiragAgg5k

src/Http/Adapter/Swoole/Request.php

@@ -67,13 +67,15 @@ public function setServer(string $key, string $value): static
     /**
      * Get IP
      *
-     * Returns users IP address.
-     * Support HTTP_X_FORWARDED_FOR header usually return
-     *  from different proxy servers or PHP default REMOTE_ADDR
+     * Extracts the client's IP address from trusted headers or falls back to the remote address.
+     * Prioritizes headers like X-Forwarded-For when behind proxies or load balancers,
+     * defaulting to REMOTE_ADDR when trusted headers are unavailable.
+     *
+     * @return string The validated client IP address or '0.0.0.0' if unavailable
      */
     public function getIP(): string
     {
-        $remoteAddr = $this->getServer('remote_addr') ?? '0.0.0.0';
+        $remoteAddr = $this->getServer('REMOTE_ADDR') ?? '0.0.0.0';
 
         foreach ($this->trustedIpHeaders as $header) {
             $headerValue = $this->getHeader($header);
@@ -83,11 +85,11 @@ public function getIP(): string
             }
 
             // Leftmost IP address is the address of the originating client
-            $ips = \explode(',', $headerValue);
-            $ip = \trim($ips[0]);
+            $ips = explode(',', $headerValue);
+            $ip = trim($ips[0]);
 
             // Validate IP format (supports both IPv4 and IPv6)
-            if (\filter_var($ip, FILTER_VALIDATE_IP)) {
+            if (filter_var($ip, FILTER_VALIDATE_IP)) {
                 return $ip;
             }
         }
@@ -270,29 +272,9 @@ public function getFiles($key): array
      */
     public function getCookie(string $key, string $default = ''): string
     {
-        $key = \strtolower($key);
-
-        $cookieHeader = $this->getHeader('cookie', '');
-        if ($cookieHeader === '') {
-            return $default;
-        }
-
-        $cookies = \explode(';', $cookieHeader);
-        foreach ($cookies as $cookie) {
-            $cookie = \trim($cookie);
-            if ($cookie === '') {
-                continue;
-            }
-
-            $parts = \explode('=', $cookie, 2);
-            $cookieKey = \trim($parts[0] ?? '');
-            $cookieValue = \trim($parts[1] ?? '');
-            if ($cookieKey === $key) {
-                return $cookieValue;
-            }
-        }
+        $key = strtolower($key);
 
-        return $default;
+        return $this->swoole->cookie[$key] ?? $default;
     }
 
     /**
@@ -338,11 +320,6 @@ public function removeHeader(string $key): static
         return $this;
     }
 
-    public function getSwooleRequest(): SwooleRequest
-    {
-        return $this->swoole;
-    }
-
     /**
      * Generate input
      *
@@ -396,12 +373,6 @@ protected function generateInput(): array
      */
     protected function generateHeaders(): array
     {
-        $headers = $this->swoole->header;
-
-        foreach ($headers as $key => $value) {
-            $headers[strtolower($key)] = $value;
-        }
-
-        return $headers;
+        return $this->swoole->header;
     }
 }

src/Http/Adapter/Swoole/Response.php

@@ -12,7 +12,7 @@ class Response extends UtopiaResponse
      *
      * @var SwooleResponse
      */
-    protected $swoole;
+    protected SwooleResponse $swoole;
 
     /**
      * Response constructor.
@@ -23,11 +23,6 @@ public function __construct(SwooleResponse $response)
         parent::__construct(\microtime(true));
     }
 
-    public function getSwooleResponse(): SwooleResponse
-    {
-        return $this->swoole;
-    }
-
     /**
      * Write
      *
@@ -50,6 +45,25 @@ public function end(?string $content = null): void
         $this->swoole->end($content);
     }
 
+    /**
+     * Get status code reason
+     *
+     * Get HTTP response status code reason from available options. If status code is unknown an exception will be thrown.
+     *
+     * @param  int  $code
+     * @return string
+     *
+     * @throws \Exception
+     */
+    protected function getStatusCodeReason(int $code): string
+    {
+        if (!\array_key_exists($code, $this->statusCodes)) {
+            throw new \Exception('Unknown HTTP status code');
+        }
+
+        return $this->statusCodes[$code];
+    }
+
     /**
      * Send Status Code
      *
@@ -58,7 +72,7 @@ public function end(?string $content = null): void
      */
     protected function sendStatus(int $statusCode): void
     {
-        $this->swoole->status($statusCode);
+        $this->swoole->status((string) $statusCode, $this->getStatusCodeReason($statusCode));
     }
 
     /**
@@ -87,13 +101,13 @@ protected function sendCookie(string $name, string $value, array $options): void
     {
         $this->swoole->cookie(
             $name,
-            $value,
-            $options['expire'] ?? 0,
-            $options['path'] ?? '',
-            $options['domain'] ?? '',
-            $options['secure'] ?? false,
-            $options['httponly'] ?? false,
-            $options['samesite'] ?? ''
+            value: $value,
+            expires: $options['expire'] ?? 0,
+            path: $options['path'] ?? '',
+            domain: $options['domain'] ?? '',
+            secure: $options['secure'] ?? false,
+            httponly: $options['httponly'] ?? false,
+            samesite: $options['samesite'] ?? false,
         );
     }
 }