fixing various null issues

Author: HarlequinSin

subdomains/database/migrations/005_add_srv_target_to_nodes.php

@@ -2,6 +2,7 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration

subdomains/lang/en/strings.php

@@ -40,7 +40,7 @@
         'cloudflare_missing_srv_port' => 'SRV port is missing for :server.',
 
         'cloudflare_missing_srv_target_title' => 'Cloudflare: Missing SRV Target',
-        'cloudflare_missing_srv_target' => 'SRV target is missing from :node. ',
+        'cloudflare_missing_srv_target' => 'SRV target is missing from :node.',
 
         'cloudflare_record_created_title' => 'Cloudflare: Record Created',
         'cloudflare_record_created' => 'Successfully created :subdomain record',

subdomains/src/Filament/Components/Actions/SetSrvTargetAction.php

@@ -28,8 +28,7 @@ protected function setUp(): void
                     ->label(fn () => trans('subdomains::strings.srv_target'))
                     ->default(fn () => $node->srv_target) // @phpstan-ignore property.notFound
                     ->placeholder('play.example.com OR IPv4/IPv6 address')
-                    ->helperText(trans('subdomains::strings.srv_target_confirmation'))
-                    ->rules(['nullable', 'string', 'regex:/^(?=.{1,253}$)(?!-)[A-Za-z0-9-]{1,63}(?<!-)(?:\.(?!-)[A-Za-z0-9-]{1,63}(?<!-))*$/']),
+                    ->helperText(trans('subdomains::strings.srv_target_confirmation')),
             ];
         });
 

subdomains/src/Filament/Server/Resources/Subdomains/SubdomainResource.php

@@ -116,7 +116,7 @@ public static function form(Schema $schema): Schema
                 TextInput::make('name')
                     ->label(trans('subdomains::strings.name'))
                     ->required()
-                    ->suffix(fn (callable $get) => CloudflareDomain::find($get('domain_id'))->name)
+                    ->suffix(fn (callable $get) => CloudflareDomain::find($get('domain_id'))?->name)
                     ->unique(),
                 Select::make('domain_id')
                     ->label(trans_choice('subdomains::strings.domain', 1))

subdomains/src/Models/Subdomain.php

@@ -120,7 +120,7 @@ public function setSrvRecordAttribute(bool $isSrvRecord): void
         if ($isSrvRecord) {
             $this->attributes['record_type'] = 'SRV';
         } else {
-            $ip = $this->server->allocation?->ip;
+            $ip = $this->server?->allocation?->ip;
             if (!empty($ip) && filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
                 $this->attributes['record_type'] = 'AAAA';
             } else {
@@ -136,9 +136,19 @@ protected function upsertOnCloudflare(): bool
         $zoneId = $this->domain->cloudflare_id;
         $domainName = $this->domain->name;
 
+        if ($this->server || $this->server->node) {
+            Log::warning('Subdomain server/node relation is null', ['subdomain_id' => $this->id]);
+            Notification::make()
+                ->danger()
+                ->title(trans('subdomains::strings.notifications.cloudflare_upsert_failed_title'))
+                ->body(trans('subdomains::strings.notifications.cloudflare_upsert_failed', ['subdomain' => $this->getLabel() ?? 'unknown', 'errors' => 'Server/node relation is null']))
+                ->send();
+
+            return false;
+        }
+
         if (empty($zoneId) || empty($domainName)) {
             Log::warning('Cloudflare zone id or name missing for domain', ['domain_id' => $this->domain_id]);
-
             Notification::make()
                 ->danger()
                 ->title(trans('subdomains::strings.notifications.cloudflare_missing_zone_title'))
@@ -192,7 +202,6 @@ protected function upsertOnCloudflare(): bool
                     if ($this->exists) {
                         $this->updateQuietly(['cloudflare_id' => $result['id']]);
                     } else {
-                        // Model is being created, set attribute so it gets persisted with the insert
                         $this->cloudflare_id = $result['id'];
                     }
                 }
@@ -225,7 +234,13 @@ protected function upsertOnCloudflare(): bool
         $result = $registrar->upsertDnsRecord($zoneId, $domainName, $this->name, $this->record_type, $ip, $this->cloudflare_id, null, null);
 
         if ($result['success'] && !empty($result['id'])) {
-            $this->cloudflare_id = $result['id'];
+            if ($this->cloudflare_id !== $result['id']) {
+                if ($this->exists) {
+                    $this->updateQuietly(['cloudflare_id' => $result['id']]);
+                } else {
+                    $this->cloudflare_id = $result['id'];
+                }
+            }
 
             return true;
         }
@@ -248,6 +263,17 @@ protected function deleteOnCloudflare(): bool
             return true;
         }
 
+        if ($this->domain || empty($this->domain->cloudflare_id)) {
+            Log::warning('Cloudflare zone missing for subdomain during subdomain delete', ['domain_id' => $this->domain_id]);
+            Notification::make()
+                ->danger()
+                ->title(trans('subdomains::strings.notifications.cloudflare_delete_failed_title'))
+                ->body(trans('subdomains::strings.notifications.cloudflare_delete_failed', ['errors' => 'Cloudflare zone missing for domain']))
+                ->send();
+
+            return false;
+        }
+
         $registrar = app(CloudflareService::class);
 
         $result = $registrar->deleteDnsRecord($this->domain->cloudflare_id, $this->cloudflare_id);