jordanpartridge · Sep 15, 2026 · Sep 13, 2026
diff --git a/app/Commands/Concerns/InteractsWithCloudflare.php b/app/Commands/Concerns/InteractsWithCloudflare.php
@@ -5,6 +5,7 @@
 namespace App\Commands\Concerns;
 
 use App\Integrations\Cloudflare\CloudflareConnector;
+use Saloon\Http\Response;
 
 trait InteractsWithCloudflare
 {
@@ -145,4 +146,45 @@ protected function resolveZoneIdForHostname(CloudflareConnector $connector, stri
 
         return null;
     }
+
+    /**
+     * Resolve a zone ID or domain name to a zone ID.
+     */
+    protected function resolveZoneId(CloudflareConnector $connector, string $zone): ?string
+    {
+        if (preg_match('/^[a-f0-9]{32}$/', $zone) === 1) {
+            return $zone;
+        }
+
+        $response = $connector->zones()->list($zone);
+
+        if ($response->successful()) {
+            $zones = $response->json('result', []);
+
+            return $zones[0]['id'] ?? null;
+        }
+
+        return null;
+    }
+
+    protected function truncate(string $value, int $length): string
+    {
+        return strlen($value) > $length
+            ? substr($value, 0, $length - 3).'...'
+            : $value;
+    }
+
+    /**
+     * Prefer Cloudflare errors.0.message when present.
+     */
+    protected function formatApiError(Response $response): string
+    {
+        $message = $response->json('errors.0.message');
+
+        if (is_string($message) && $message !== '') {
+            return $message;
+        }
+
+        return $response->body();
+    }
 }
diff --git a/app/Commands/DnsCreateCommand.php b/app/Commands/DnsCreateCommand.php
@@ -6,7 +6,6 @@
 
 use App\Commands\Concerns\InteractsWithCloudflare;
 use App\Commands\Concerns\OutputsJson;
-use App\Integrations\Cloudflare\CloudflareConnector;
 use LaravelZero\Framework\Commands\Command;
 
 class DnsCreateCommand extends Command
@@ -32,17 +31,13 @@ public function handle(): int
             return self::FAILURE;
         }
 
-        $zone = $this->argument('zone');
-
-        if (! preg_match('/^[a-f0-9]{32}$/', $zone)) {
-            $zoneId = $this->resolveZoneId($connector, $zone);
-            if (! $zoneId) {
-                return $this->jsonFail("Zone not found: {$zone}");
-            }
-            $zone = $zoneId;
+        $zone = (string) $this->argument('zone');
+        $zoneId = $this->resolveZoneId($connector, $zone);
+        if (! $zoneId) {
+            return $this->jsonFail("Zone not found: {$zone}");
         }
 
-        $response = $connector->dns($zone)->create(
+        $response = $connector->dns($zoneId)->create(
             $this->argument('type'),
             $this->argument('name'),
             $this->argument('content'),
@@ -51,7 +46,7 @@ public function handle(): int
         );
 
         if (! $response->successful()) {
-            return $this->jsonFail('Failed to create DNS record: '.$response->body());
+            return $this->jsonFail('Failed to create DNS record: '.$this->formatApiError($response));
         }
 
         $record = $response->json('result');
@@ -71,16 +66,4 @@ public function handle(): int
 
         return self::SUCCESS;
     }
-
-    protected function resolveZoneId(CloudflareConnector $connector, string $name): ?string
-    {
-        $response = $connector->zones()->list($name);
-        if ($response->successful()) {
-            $zones = $response->json('result', []);
-
-            return $zones[0]['id'] ?? null;
-        }
-
-        return null;
-    }
 }
diff --git a/app/Commands/DnsDeleteCommand.php b/app/Commands/DnsDeleteCommand.php
@@ -4,11 +4,15 @@
 
 namespace App\Commands;
 
-use App\Integrations\Cloudflare\CloudflareConnector;
+use App\Commands\Concerns\InteractsWithCloudflare;
+use App\Commands\Concerns\OutputsJson;
 use LaravelZero\Framework\Commands\Command;
 
 class DnsDeleteCommand extends Command
 {
+    use InteractsWithCloudflare;
+    use OutputsJson;
+
     protected $signature = 'dns:delete
         {zone : Zone ID or domain name}
         {id : DNS record ID to delete}
@@ -20,71 +24,40 @@ class DnsDeleteCommand extends Command
     public function handle(): int
     {
         $connector = $this->getConnector();
+        if ($connector === null) {
+            return self::FAILURE;
+        }
+
         $zone = (string) $this->argument('zone');
         $recordId = (string) $this->argument('id');
 
-        // If zone looks like a domain, resolve it to ID
-        if (! preg_match('/^[a-f0-9]{32}$/', $zone)) {
-            $zoneId = $this->resolveZoneId($connector, $zone);
-            if (! $zoneId) {
-                $this->error("Zone not found: {$zone}");
-
-                return self::FAILURE;
-            }
-            $zone = $zoneId;
+        $zoneId = $this->resolveZoneId($connector, $zone);
+        if (! $zoneId) {
+            return $this->jsonFail("Zone not found: {$zone}");
         }
 
-        if (! $this->option('force')) {
+        if (! $this->option('force') && ! $this->wantsJson()) {
             if (! $this->confirm("Delete DNS record {$recordId}?")) {
                 $this->info('Cancelled.');
 
                 return self::SUCCESS;
             }
         }
 
-        $response = $connector->dns($zone)->delete($recordId);
+        $response = $connector->dns($zoneId)->delete($recordId);
 
         if (! $response->successful()) {
-            $this->error('Failed to delete DNS record: '.$response->body());
-
-            return self::FAILURE;
+            return $this->jsonFail('Failed to delete DNS record: '.$this->formatApiError($response));
         }
 
         $result = $response->json('result');
 
-        if ($this->option('json')) {
-            $this->line(json_encode($result ?? ['id' => $recordId], JSON_PRETTY_PRINT));
-
-            return self::SUCCESS;
+        if ($this->wantsJson()) {
+            return $this->jsonSuccess($result ?? ['id' => $recordId]);
         }
 
         $this->info('DNS record deleted successfully.');
 
         return self::SUCCESS;
     }
-
-    protected function resolveZoneId(CloudflareConnector $connector, string $name): ?string
-    {
-        $response = $connector->zones()->list($name);
-        if ($response->successful()) {
-            $zones = $response->json('result', []);
-
-            return $zones[0]['id'] ?? null;
-        }
-
-        return null;
-    }
-
-    protected function getConnector(): CloudflareConnector
-    {
-        $token = env('CLOUDFLARE_API_TOKEN');
-        $accountId = env('CLOUDFLARE_ACCOUNT_ID');
-
-        if (! $token) {
-            $this->error('CLOUDFLARE_API_TOKEN not set');
-            exit(1);
-        }
-
-        return new CloudflareConnector($token, $accountId);
-    }
 }
diff --git a/app/Commands/DnsListCommand.php b/app/Commands/DnsListCommand.php
@@ -6,7 +6,6 @@
 
 use App\Commands\Concerns\InteractsWithCloudflare;
 use App\Commands\Concerns\OutputsJson;
-use App\Integrations\Cloudflare\CloudflareConnector;
 use LaravelZero\Framework\Commands\Command;
 
 class DnsListCommand extends Command
@@ -29,23 +28,19 @@ public function handle(): int
             return self::FAILURE;
         }
 
-        $zone = $this->argument('zone');
-
-        if (! preg_match('/^[a-f0-9]{32}$/', $zone)) {
-            $zoneId = $this->resolveZoneId($connector, $zone);
-            if (! $zoneId) {
-                return $this->jsonFail("Zone not found: {$zone}");
-            }
-            $zone = $zoneId;
+        $zone = (string) $this->argument('zone');
+        $zoneId = $this->resolveZoneId($connector, $zone);
+        if (! $zoneId) {
+            return $this->jsonFail("Zone not found: {$zone}");
         }
 
-        $response = $connector->dns($zone)->list(
+        $response = $connector->dns($zoneId)->list(
             $this->option('type'),
             $this->option('name')
         );
 
         if (! $response->successful()) {
-            return $this->jsonFail('Failed to list DNS records: '.$response->body());
+            return $this->jsonFail('Failed to list DNS records: '.$this->formatApiError($response));
         }
 
         $records = $response->json('result', []);
@@ -73,23 +68,4 @@ public function handle(): int
 
         return self::SUCCESS;
     }
-
-    protected function resolveZoneId(CloudflareConnector $connector, string $name): ?string
-    {
-        $response = $connector->zones()->list($name);
-        if ($response->successful()) {
-            $zones = $response->json('result', []);
-
-            return $zones[0]['id'] ?? null;
-        }
-
-        return null;
-    }
-
-    protected function truncate(string $value, int $length): string
-    {
-        return strlen($value) > $length
-            ? substr($value, 0, $length - 3).'...'
-            : $value;
-    }
 }
diff --git a/app/Commands/DnsUpdateCommand.php b/app/Commands/DnsUpdateCommand.php
@@ -4,11 +4,15 @@
 
 namespace App\Commands;
 
-use App\Integrations\Cloudflare\CloudflareConnector;
+use App\Commands\Concerns\InteractsWithCloudflare;
+use App\Commands\Concerns\OutputsJson;
 use LaravelZero\Framework\Commands\Command;
 
 class DnsUpdateCommand extends Command
 {
+    use InteractsWithCloudflare;
+    use OutputsJson;
+
     protected $signature = 'dns:update
         {zone : Zone ID or domain name}
         {id : DNS record ID to update}
@@ -24,20 +28,17 @@ class DnsUpdateCommand extends Command
     public function handle(): int
     {
         $connector = $this->getConnector();
-        $zone = (string) $this->argument('zone');
-
-        // If zone looks like a domain, resolve it to ID
-        if (! preg_match('/^[a-f0-9]{32}$/', $zone)) {
-            $zoneId = $this->resolveZoneId($connector, $zone);
-            if (! $zoneId) {
-                $this->error("Zone not found: {$zone}");
+        if ($connector === null) {
+            return self::FAILURE;
+        }
 
-                return self::FAILURE;
-            }
-            $zone = $zoneId;
+        $zone = (string) $this->argument('zone');
+        $zoneId = $this->resolveZoneId($connector, $zone);
+        if (! $zoneId) {
+            return $this->jsonFail("Zone not found: {$zone}");
         }
 
-        $response = $connector->dns($zone)->update(
+        $response = $connector->dns($zoneId)->update(
             (string) $this->argument('id'),
             (string) $this->argument('type'),
             (string) $this->argument('name'),
@@ -47,17 +48,13 @@ public function handle(): int
         );
 
         if (! $response->successful()) {
-            $this->error('Failed to update DNS record: '.$response->body());
-
-            return self::FAILURE;
+            return $this->jsonFail('Failed to update DNS record: '.$this->formatApiError($response));
         }
 
         $record = $response->json('result');
 
-        if ($this->option('json')) {
-            $this->line(json_encode($record, JSON_PRETTY_PRINT));
-
-            return self::SUCCESS;
+        if ($this->wantsJson()) {
+            return $this->jsonSuccess($record);
         }
 
         $this->info('DNS record updated successfully!');
@@ -72,29 +69,4 @@ public function handle(): int
 
         return self::SUCCESS;
     }
-
-    protected function resolveZoneId(CloudflareConnector $connector, string $name): ?string
-    {
-        $response = $connector->zones()->list($name);
-        if ($response->successful()) {
-            $zones = $response->json('result', []);
-
-            return $zones[0]['id'] ?? null;
-        }
-
-        return null;
-    }
-
-    protected function getConnector(): CloudflareConnector
-    {
-        $token = env('CLOUDFLARE_API_TOKEN');
-        $accountId = env('CLOUDFLARE_ACCOUNT_ID');
-
-        if (! $token) {
-            $this->error('CLOUDFLARE_API_TOKEN not set');
-            exit(1);
-        }
-
-        return new CloudflareConnector($token, $accountId);
-    }
 }
diff --git a/app/Commands/TunnelCreateCommand.php b/app/Commands/TunnelCreateCommand.php
@@ -35,7 +35,7 @@ public function handle(): int
         $response = $connector->tunnels()->create($name);
 
         if (! $response->successful()) {
-            return $this->jsonFail('Failed to create tunnel: '.$response->body());
+            return $this->jsonFail('Failed to create tunnel: '.$this->formatApiError($response));
         }
 
         $tunnel = $response->json('result') ?? [];

diff --git a/app/Commands/TunnelDeleteCommand.php b/app/Commands/TunnelDeleteCommand.php
@@ -44,7 +44,7 @@ public function handle(): int
         $response = $connector->tunnels()->delete($tunnelId);
 
         if (! $response->successful()) {
-            return $this->jsonFail('Failed to delete tunnel: '.$response->body());
+            return $this->jsonFail('Failed to delete tunnel: '.$this->formatApiError($response));
         }
 
         if ($this->wantsJson()) {

diff --git a/app/Commands/TunnelExposeCommand.php b/app/Commands/TunnelExposeCommand.php
@@ -39,7 +39,7 @@ public function handle(): int
         $response = $connector->tunnels()->create($name);
 
         if (! $response->successful()) {
-            return $this->jsonFail('Failed to create tunnel: '.$response->body());
+            return $this->jsonFail('Failed to create tunnel: '.$this->formatApiError($response));
         }
 
         $tunnel = $response->json('result') ?? [];