Apply suggestion from @Copilot

Co-authored-by: Copilot <[email protected]>

Author: loks0n

Dockerfile

@@ -11,7 +11,7 @@ COPY composer.json /usr/local/src/
 RUN composer install --ignore-platform-reqs --optimize-autoloader \
     --no-plugins --no-scripts --prefer-dist
 
-FROM appwrite/base:0.10.4 as final
+FROM appwrite/base:0.11.3 as final
 
 LABEL maintainer="[email protected]"
 

composer.json

@@ -21,9 +21,9 @@
         "psr-4": {"Utopia\\DNS\\": "src/DNS"}
     },
     "require": {
-        "php": ">=8.3",
+        "php": ">=8.4",
         "utopia-php/console": "0.0.*",
-        "utopia-php/telemetry": "^0.1.1"
+        "utopia-php/telemetry": "0.1.*"
     },
     "require-dev": {
         "swoole/ide-helper": "5.1.8",

composer.lock

@@ -3,7 +3,7 @@ services:
     image: dns-dev
     build:
       context: .
-    command: [ "sh", "-c", "php /usr/src/code/tests/resource/server.php" ]
+    command: [ "sh", "-c", "php /usr/src/code/tests/resources/server.php" ]
     volumes:
       - ./bin:/usr/src/code/bin
       - ./src:/usr/src/code/src

docker-compose.yml

@@ -3,7 +3,6 @@
 namespace Utopia\DNS;
 
 use Exception;
-use Utopia\DNS\Message\Question;
 
 class Client
 {
@@ -33,42 +32,37 @@ public function __construct(string $server = '127.0.0.1', int $port = 53, int $t
     }
 
     /**
-     * @param Question $question
+     * @param Message $message
      * @return Message
      */
-    public function query(Question $question): Message
+    public function query(Message $message): Message
     {
-        try {
-            $message = Message::query($question);
-            $packet = $message->encode();
-            if (socket_sendto($this->socket, $packet, strlen($packet), 0, $this->server, $this->port) === false) {
-                throw new Exception('Failed to send data: ' . socket_strerror(socket_last_error($this->socket)));
-            }
-
-            $response = '';
-            $from = '';
-            $port = 0;
+        $packet = $message->encode();
+        if (socket_sendto($this->socket, $packet, strlen($packet), 0, $this->server, $this->port) === false) {
+            throw new Exception('Failed to send data: ' . socket_strerror(socket_last_error($this->socket)));
+        }
 
-            $result = socket_recvfrom($this->socket, $response, 512, 0, $from, $port);
+        $data = '';
+        $from = '';
+        $port = 0;
 
-            if ($result === false) {
-                $error = socket_last_error($this->socket);
-                $errorMessage = socket_strerror($error);
-                throw new Exception("Failed to receive data from {$this->server}: {$errorMessage} (Error code: {$error})");
-            }
+        $result = socket_recvfrom($this->socket, $data, 512, 0, $from, $port);
 
-            if (empty($response)) {
-                throw new Exception("Empty response received from {$this->server}:{$this->port}");
-            }
+        if ($result === false) {
+            $error = socket_last_error($this->socket);
+            $errorMessage = socket_strerror($error);
+            throw new Exception("Failed to receive data from {$this->server}: {$errorMessage} (Error code: {$error})");
+        }
 
-            $response = Message::decode($response);
-            if ($response->header->id !== $message->header->id) {
-                throw new Exception("Mismatched DNS transaction ID. Expected {$message->header->id}, got {$response->header->id}");
-            }
+        if (empty($data)) {
+            throw new Exception("Empty response received from {$this->server}:{$this->port}");
+        }
 
-            return $response;
-        } catch (Exception $e) {
-            throw new Exception($e->getMessage(), $e->getCode(), $e);
+        $response = Message::decode($data);
+        if ($response->header->id !== $message->header->id) {
+            throw new Exception("Mismatched DNS transaction ID. Expected {$message->header->id}, got {$response->header->id}");
         }
+
+        return $response;
     }
 }

src/DNS/Client.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Utopia\DNS\Exception;
+
+/**
+ * Exception thrown when a DNS message is not decoded.
+ */
+class DecodingException extends \RuntimeException
+{
+}

src/DNS/Exception/DecodingException.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Utopia\DNS\Exception;
+
+use Utopia\DNS\Message;
+use Utopia\DNS\Message\Header;
+
+/**
+ * Exception thrown when a DNS message header is decoded, but the message is not fully decoded.
+ */
+final class PartialDecodingException extends DecodingException
+{
+    public function __construct(
+        private readonly Header $header,
+        string $message = '',
+        ?\Throwable $previous = null
+    ) {
+        parent::__construct($message, Message::RCODE_FORMERR, $previous);
+    }
+
+    public function getHeader(): Header
+    {
+        return $this->header;
+    }
+}

src/DNS/Exception/PartialDecodingException.php

@@ -2,6 +2,8 @@
 
 namespace Utopia\DNS;
 
+use Utopia\DNS\Exception\DecodingException;
+use Utopia\DNS\Exception\PartialDecodingException;
 use Utopia\DNS\Message\Header;
 use Utopia\DNS\Message\Question;
 use Utopia\DNS\Message\Record;
@@ -20,15 +22,22 @@ final class Message
     public const int RCODE_NOTAUTH = 9;
     public const int RCODE_NOTZONE = 10;
 
+    /**
+     * @param Header $header The header of the message.
+     * @param Question[] $questions The question records.
+     * @param list<Record> $answers The answer records.
+     * @param list<Record> $authority The authority records.
+     * @param list<Record> $additional The additional records.
+     */
     public function __construct(
         public readonly Header $header,
         /** @var Question[] */
         public readonly array $questions = [],
-        /** @var Record[] */
+        /** @var list<Record> */
         public readonly array $answers = [],
-        /** @var Record[] */
+        /** @var list<Record> */
         public readonly array $authority = [],
-        /** @var Record[] */
+        /** @var list<Record> */
         public readonly array $additional = []
     ) {
         if ($header->questionCount !== count($questions)) {
@@ -43,7 +52,7 @@ public function __construct(
         if ($header->additionalCount !== count($additional)) {
             throw new \InvalidArgumentException('Invalid DNS response: additional count mismatch');
         }
-        if ($header->isResponse && !array_any($this->authority, fn ($record) => $record->type === Record::TYPE_SOA)) {
+        if ($header->isResponse && $header->authoritative && !array_any($this->authority, fn ($record) => $record->type === Record::TYPE_SOA)) {
             if ($header->responseCode === self::RCODE_NXDOMAIN) {
                 throw new \InvalidArgumentException('NXDOMAIN requires SOA in authority');
             }
@@ -83,19 +92,21 @@ public static function query(
     /**
      * Create a response message.
      *
-     * @param Message $query The query message to respond to.
+     * @param Header $header The header of the query message to respond to.
      * @param int $responseCode The response code.
-     * @param array<Record> $answers The answer records.
-     * @param array<Record> $authority The authority records.
-     * @param array<Record> $additional The additional records.
+     * @param array<Question> $questions The question records.
+     * @param list<Record> $answers The answer records.
+     * @param list<Record> $authority The authority records.
+     * @param list<Record> $additional The additional records.
      * @param bool $authoritative Whether the response is authoritative.
      * @param bool $truncated Whether the response is truncated.
      * @param bool $recursionAvailable Whether recursion is available.
      * @return self The response message.
      */
     public static function response(
-        Message $query,
+        Header $header,
         int $responseCode,
+        array $questions = [],
         array $answers = [],
         array $authority = [],
         array $additional = [],
@@ -104,59 +115,64 @@ public static function response(
         bool $recursionAvailable = false
     ): self {
         $header = new Header(
-            id: $query->header->id,
+            id: $header->id,
             isResponse: true,
-            opcode: $query->header->opcode,
+            opcode: $header->opcode,
             authoritative: $authoritative,
             truncated: $truncated,
-            recursionDesired: $query->header->recursionDesired,
+            recursionDesired: $header->recursionDesired,
             recursionAvailable: $recursionAvailable,
             responseCode: $responseCode,
-            questionCount: count($query->questions),
+            questionCount: count($questions),
             answerCount: count($answers),
             authorityCount: count($authority),
             additionalCount: count($additional)
         );
 
-        return new self($header, $query->questions, $answers, $authority, $additional);
+
+        return new self($header, $questions, $answers, $authority, $additional);
     }
 
     public static function decode(string $packet): self
     {
         if (strlen($packet) < Header::LENGTH) {
-            throw new \InvalidArgumentException('Invalid DNS response: header too short');
+            throw new DecodingException('Invalid DNS response: header too short');
         }
 
         // --- Parse header (12 bytes) ---
         $header = Header::decode($packet);
 
         // --- Parse Question Section ---
-        $offset = Header::LENGTH;
-        $questions = [];
-        for ($i = 0; $i < $header->questionCount; $i++) {
-            $questions[] = Question::decode($packet, $offset);
-        }
+        try {
+            $offset = Header::LENGTH;
+            $questions = [];
+            for ($i = 0; $i < $header->questionCount; $i++) {
+                $questions[] = Question::decode($packet, $offset);
+            }
 
-        // --- Decode Answer Section ---
-        $answers = [];
-        for ($i = 0; $i < $header->answerCount; $i++) {
-            $answers[] = Record::decode($packet, $offset);
-        }
+            // --- Decode Answer Section ---
+            $answers = [];
+            for ($i = 0; $i < $header->answerCount; $i++) {
+                $answers[] = Record::decode($packet, $offset);
+            }
 
-        // --- Decode Authority Section ---
-        $authority = [];
-        for ($i = 0; $i < $header->authorityCount; $i++) {
-            $authority[] = Record::decode($packet, $offset);
-        }
+            // --- Decode Authority Section ---
+            $authority = [];
+            for ($i = 0; $i < $header->authorityCount; $i++) {
+                $authority[] = Record::decode($packet, $offset);
+            }
 
-        // --- Decode Additional Section ---
-        $additional = [];
-        for ($i = 0; $i < $header->additionalCount; $i++) {
-            $additional[] = Record::decode($packet, $offset);
-        }
+            // --- Decode Additional Section ---
+            $additional = [];
+            for ($i = 0; $i < $header->additionalCount; $i++) {
+                $additional[] = Record::decode($packet, $offset);
+            }
 
-        if ($offset !== strlen($packet)) {
-            throw new \InvalidArgumentException('Invalid packet length');
+            if ($offset !== strlen($packet)) {
+                throw new DecodingException('Invalid packet length');
+            }
+        } catch (DecodingException $e) {
+            throw new PartialDecodingException($header, $e->getMessage(), $e);
         }
 
         return new self($header, $questions, $answers, $authority, $additional);