@serve.zone/dcrouter 16.4.1 → 16.5.0

package/ts/dns/manager.dns.ts

@@ -88,10 +88,12 @@ export class DnsManager {
     let registered = 0;
     for (const domain of dcrouterDomains) {
       const records = await DnsRecordDoc.findByDomainId(domain.id);
-      for (const rec of records) {
-        this.registerRecordWithDnsServer(rec);
-        registered++;
+      const rrsets = new Set(records.map((record) => this.rrsetKey(record.name, record.type)));
+      for (const rrset of rrsets) {
+        const [name, type] = rrset.split('|') as [string, TDnsRecordType];
+        await this.refreshLocalRrset(domain.id, name, type);
       }
+      registered += records.length;
       await this.registerAuthoritativeZoneDefaults(domain);
     }
     logger.log(
@@ -167,6 +169,26 @@ export class DnsManager {
     });
   }
 
+  private rrsetKey(name: string, type: TDnsRecordType): string {
+    return `${name.toLowerCase()}|${type}`;
+  }
+
+  /** Rebuild one authoritative RRset atomically from persisted rows. */
+  private async refreshLocalRrset(
+    domainId: string,
+    name: string,
+    type: TDnsRecordType,
+  ): Promise<void> {
+    if (!this.dnsServer) return;
+    this.dnsServer.unregisterHandler(name, [type]);
+    const records = await DnsRecordDoc.findByDomainId(domainId);
+    for (const record of records) {
+      if (record.name.toLowerCase() === name.toLowerCase() && record.type === type) {
+        this.registerRecordWithDnsServer(record);
+      }
+    }
+  }
+
   private parseRecordData(type: TDnsRecordType, value: string): any {
     switch (type) {
       case 'A':
@@ -608,9 +630,16 @@ export class DnsManager {
     const doc = await DomainDoc.findById(id);
     if (!doc) return false;
     const records = await DnsRecordDoc.findByDomainId(id);
+    const localRrsets = new Set(records.map((record) => this.rrsetKey(record.name, record.type)));
     for (const r of records) {
       await r.delete();
     }
+    if (doc.source === 'dcrouter' && this.dnsServer) {
+      for (const rrset of localRrsets) {
+        const [name, type] = rrset.split('|') as [string, TDnsRecordType];
+        this.dnsServer.unregisterHandler(name, [type]);
+      }
+    }
     await doc.delete();
     return true;
   }
@@ -631,13 +660,34 @@ export class DnsManager {
     }
     const providerRecords = await client.listRecords(doc.name);
 
-    // Drop existing records and replace
+    // Merge by provider id, then exact tuple. Replacing the collection would
+    // erase explicit ownership metadata from reconciler-managed rows.
     const existing = await DnsRecordDoc.findByDomainId(id);
-    for (const r of existing) {
-      await r.delete();
-    }
+    const remaining = new Set(existing);
     for (const pr of providerRecords) {
-      await this.createSyncedRecord(id, pr, doc.createdBy);
+      const match = existing.find((record) => record.providerRecordId === pr.providerRecordId)
+        || existing.find((record) => (
+          record.name.toLowerCase() === pr.name.toLowerCase()
+          && record.type === pr.type
+          && record.value.trim() === pr.value.trim()
+        ));
+      if (!match) {
+        await this.createSyncedRecord(id, pr, doc.createdBy);
+        continue;
+      }
+      remaining.delete(match);
+      match.name = pr.name.toLowerCase();
+      match.type = pr.type;
+      match.value = pr.value;
+      match.ttl = pr.ttl;
+      match.proxied = pr.proxied;
+      match.source = 'synced';
+      match.providerRecordId = pr.providerRecordId;
+      match.updatedAt = Date.now();
+      await match.save();
+    }
+    for (const staleMirror of remaining) {
+      await staleMirror.delete();
     }
     doc.lastSyncedAt = Date.now();
     doc.updatedAt = doc.lastSyncedAt;
@@ -811,6 +861,9 @@ export class DnsManager {
     ttl?: number;
     proxied?: boolean;
     createdBy: string;
+    managedBy?: string;
+    managedOwnerId?: string;
+    managedRecordKey?: string;
   }): Promise<{ success: boolean; id?: string; message?: string }> {
     const domain = await DomainDoc.findById(args.domainId);
     if (!domain) return { success: false, message: 'Domain not found' };
@@ -828,6 +881,9 @@ export class DnsManager {
     doc.createdAt = now;
     doc.updatedAt = now;
     doc.createdBy = args.createdBy;
+    doc.managedBy = args.managedBy;
+    doc.managedOwnerId = args.managedOwnerId;
+    doc.managedRecordKey = args.managedRecordKey;
 
     if (domain.source === 'provider') {
       // Push to provider first; only persist locally on success
@@ -849,12 +905,12 @@ export class DnsManager {
       } catch (err: unknown) {
         return { success: false, message: `Provider rejected record: ${(err as Error).message}` };
       }
-    } else {
-      // dcrouter-hosted / authoritative — register with embedded DnsServer immediately
-      this.registerRecordWithDnsServer(doc);
     }
 
     await doc.save();
+    if (domain.source === 'dcrouter') {
+      await this.refreshLocalRrset(doc.domainId, doc.name, doc.type);
+    }
     return { success: true, id: doc.id };
   }
 
@@ -870,6 +926,8 @@ export class DnsManager {
     const domain = await DomainDoc.findById(doc.domainId);
     if (!domain) return { success: false, message: 'Parent domain not found' };
 
+    const previousName = doc.name;
+    const previousType = doc.type;
     if (args.name !== undefined) doc.name = args.name.toLowerCase();
     if (args.value !== undefined) doc.value = args.value;
     if (args.ttl !== undefined) doc.ttl = args.ttl;
@@ -893,12 +951,15 @@ export class DnsManager {
       } catch (err: unknown) {
         return { success: false, message: `Provider rejected update: ${(err as Error).message}` };
       }
-    } else {
-      // Re-register the local record so the new closure picks up the updated fields
-      this.registerRecordWithDnsServer(doc);
     }
 
     await doc.save();
+    if (domain.source === 'dcrouter') {
+      await this.refreshLocalRrset(doc.domainId, previousName, previousType);
+      if (previousName.toLowerCase() !== doc.name.toLowerCase()) {
+        await this.refreshLocalRrset(doc.domainId, doc.name, doc.type);
+      }
+    }
     return { success: true };
   }
 
@@ -909,24 +970,23 @@ export class DnsManager {
     if (!domain) return { success: false, message: 'Parent domain not found' };
 
     if (domain.source === 'provider') {
-      if (domain.providerId && doc.providerRecordId) {
-        const client = await this.getProviderClientById(domain.providerId);
-        if (client) {
-          try {
-            await client.deleteRecord(domain.name, doc.providerRecordId);
-          } catch (err: unknown) {
-            return { success: false, message: `Provider rejected delete: ${(err as Error).message}` };
-          }
-        }
+      if (!domain.providerId || !doc.providerRecordId) {
+        return { success: false, message: 'Provider record metadata missing' };
+      }
+      const client = await this.getProviderClientById(domain.providerId);
+      if (!client) {
+        return { success: false, message: 'Provider client unavailable' };
+      }
+      try {
+        await client.deleteRecord(domain.name, doc.providerRecordId);
+      } catch (err: unknown) {
+        return { success: false, message: `Provider rejected delete: ${(err as Error).message}` };
       }
     }
-    // For dcrouter-hosted records: unregister the handler from the embedded DnsServer
-    // so the record stops being served immediately (not just after restart).
-    if (domain.source === 'dcrouter' && this.dnsServer) {
-      this.unregisterRecordFromDnsServer(doc);
-    }
-
     await doc.delete();
+    if (domain.source === 'dcrouter') {
+      await this.refreshLocalRrset(doc.domainId, doc.name, doc.type);
+    }
     return { success: true };
   }
 

package/ts/dns/providers/cloudflare.provider.ts

@@ -49,17 +49,21 @@ export class CloudflareDnsProvider implements IDnsProviderClient {
   }
 
   public async listRecords(domain: string): Promise<IProviderRecord[]> {
-    const records = await this.cfAccount.recordManager.listRecords(domain);
+    const zoneId = await this.cfAccount.zoneManager.getZoneId(domain);
+    const records: any[] = [];
+    // RecordManager.listRecords() intentionally converts provider failures to
+    // an empty array. DNS reconciliation must distinguish an empty zone from
+    // an unavailable provider, so use the raw paginated iterator and let
+    // errors propagate to the durable reconciliation outcome.
+    for await (const record of (this.cfAccount as any).apiAccount.dns.records.list({
+      zone_id: zoneId,
+      per_page: 100,
+    })) {
+      records.push(record);
+    }
     return records
       .filter((r) => this.isSupportedType(r.type))
-      .map((r) => ({
-        providerRecordId: r.id,
-        name: r.name,
-        type: r.type as TDnsRecordType,
-        value: r.content,
-        ttl: r.ttl,
-        proxied: r.proxied,
-      }));
+      .map((r) => this.fromApiRecord(r));
   }
 
   public async createRecord(
@@ -71,21 +75,14 @@ export class CloudflareDnsProvider implements IDnsProviderClient {
       zone_id: zoneId,
       type: record.type,
       name: record.name,
-      content: record.value,
       ttl: record.ttl ?? 1, // 1 = automatic
+      ...this.toApiRecordValue(record),
     };
     if (record.proxied !== undefined) {
       apiRecord.proxied = record.proxied;
     }
     const created = await (this.cfAccount as any).apiAccount.dns.records.create(apiRecord);
-    return {
-      providerRecordId: created.id,
-      name: created.name,
-      type: created.type as TDnsRecordType,
-      value: created.content,
-      ttl: created.ttl,
-      proxied: created.proxied,
-    };
+    return this.fromApiRecord(created);
   }
 
   public async updateRecord(
@@ -98,8 +95,8 @@ export class CloudflareDnsProvider implements IDnsProviderClient {
       zone_id: zoneId,
       type: record.type,
       name: record.name,
-      content: record.value,
       ttl: record.ttl ?? 1,
+      ...this.toApiRecordValue(record),
     };
     if (record.proxied !== undefined) {
       apiRecord.proxied = record.proxied;
@@ -108,14 +105,7 @@ export class CloudflareDnsProvider implements IDnsProviderClient {
       providerRecordId,
       apiRecord,
     );
-    return {
-      providerRecordId: updated.id,
-      name: updated.name,
-      type: updated.type as TDnsRecordType,
-      value: updated.content,
-      ttl: updated.ttl,
-      proxied: updated.proxied,
-    };
+    return this.fromApiRecord(updated);
   }
 
   public async deleteRecord(domain: string, providerRecordId: string): Promise<void> {
@@ -128,4 +118,33 @@ export class CloudflareDnsProvider implements IDnsProviderClient {
   private isSupportedType(type: string): boolean {
     return ['A', 'AAAA', 'CNAME', 'MX', 'TXT', 'NS', 'SOA', 'CAA'].includes(type);
   }
+
+  private toApiRecordValue(record: IProviderRecordInput): { content: string; priority?: number } {
+    if (record.type !== 'MX') {
+      return { content: record.value };
+    }
+    const match = record.value.trim().match(/^(\d+)\s+(.+)$/);
+    if (!match) {
+      throw new Error(`CloudflareDnsProvider: invalid MX value "${record.value}"; expected "<priority> <exchange>"`);
+    }
+    const priority = Number.parseInt(match[1], 10);
+    if (!Number.isInteger(priority) || priority < 0 || priority > 65535) {
+      throw new Error(`CloudflareDnsProvider: invalid MX priority in "${record.value}"`);
+    }
+    return { content: match[2], priority };
+  }
+
+  private fromApiRecord(record: any): IProviderRecord {
+    const value = record.type === 'MX'
+      ? `${Number(record.priority)} ${record.content}`
+      : String(record.content);
+    return {
+      providerRecordId: String(record.id),
+      name: String(record.name),
+      type: record.type as TDnsRecordType,
+      value,
+      ttl: Number(record.ttl),
+      ...(record.proxied !== undefined ? { proxied: Boolean(record.proxied) } : {}),
+    };
+  }
 }