pmcf 1.94.4 → 1.95.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.94.4",
+  "version": "1.95.0",
   "publishConfig": {
     "access": "public"
   },

package/src/dns.mjs

@@ -323,7 +323,7 @@ async function generateZoneDefs(dns, packageData) {
       address,
       subnet,
       networkInterface,
-      domainName
+      domainNames
     } of dns.owner.networkAddresses()) {
       const host = networkInterface.host;
       if (
@@ -332,13 +332,15 @@ async function generateZoneDefs(dns, packageData) {
       ) {
         addresses.add(address);
 
-        zone.records.add(
-          DNSRecord(
-            dnsFullName(domainName),
-            isIPv6Address(address) ? "AAAA" : "A",
-            normalizeIPAddress(address)
-          )
-        );
+        for (const domainName of domainNames) {
+          zone.records.add(
+            DNSRecord(
+              dnsFullName(domainName),
+              isIPv6Address(address) ? "AAAA" : "A",
+              normalizeIPAddress(address)
+            )
+          );
+        }
         if (subnet && host.domain === domain) {
           let reverseZone = reverseZones.get(subnet.address);
 
@@ -376,11 +378,13 @@ async function generateZoneDefs(dns, packageData) {
         }
 
         for (const service of host.findServices()) {
-          for (const record of service.dnsRecordsForDomainName(
-            domainName,
-            dns.hasSVRRecords
-          )) {
-            zone.records.add(record);
+          for (const domainName of domainNames) {
+            for (const record of service.dnsRecordsForDomainName(
+              domainName,
+              dns.hasSVRRecords
+            )) {
+              zone.records.add(record);
+            }
           }
         }
       }

package/src/host.mjs

@@ -255,7 +255,7 @@ export class Host extends Base {
   }
 
   get os() {
-    return this.#os || this.extends.find(e => e.os)?.os
+    return this.#os || this.extends.find(e => e.os)?.os;
   }
 
   set distribution(value) {
@@ -263,7 +263,9 @@ export class Host extends Base {
   }
 
   get distribution() {
-    return this.#distribution || this.extends.find(e => e.distribution);
+    return (
+      this.#distribution || this.extends.find(e => e.distribution)?.distribution
+    );
   }
 
   get modelName() {
@@ -289,12 +291,19 @@ export class Host extends Base {
     return this.foreignDomains.union(this.localDomains);
   }
 
+  get directDomainNames() {
+    return new Set(
+      [this.hostName, ...this.aliases].map(n => domainName(n, this.domain))
+    );
+  }
+
   get domainNames() {
     return new Set(
       [
-        ...[...this.networkInterfaces.values()].map(ni => ni.domainName),
-        this.hostName,
-        ...this.aliases
+        ...[...this.networkInterfaces.values()].reduce(
+          (all, networkInterface) => all.union(networkInterface.domainNames),
+          this.directDomainNames
+        )
       ].map(n => domainName(n, this.domain))
     );
   }
@@ -376,7 +385,7 @@ export class Host extends Base {
       for (const [address, subnet] of networkInterface.ipAddresses) {
         yield {
           networkInterface,
-          domainName: networkInterface.domainName,
+          domainNames: networkInterface.domainNames,
           address,
           subnet
         };
@@ -553,10 +562,10 @@ export class NetworkInterface extends Base {
     }
   }
 
-  get domainName() {
+  get domainNames() {
     return this.hostName
-      ? [this.hostName, this.host.domain].join(".")
-      : this.host.domainName;
+      ? new Set([[this.hostName, this.host.domain].join(".")])
+      : this.host.directDomainNames;
   }
 
   get host() {

package/types/host.d.mts

@@ -201,6 +201,7 @@ export class Host extends Base {
     get foreignDomainNames(): any[];
     get foreignDomains(): Set<any>;
     get domains(): Set<any>;
+    get directDomainNames(): Set<any>;
     get domainNames(): Set<any>;
     get domainName(): any;
     domainNamesIn(domain: any): Generator<any, void, unknown>;
@@ -210,7 +211,7 @@ export class Host extends Base {
     get networkInterfaces(): Map<any, any>;
     networkAddresses(): Generator<{
         networkInterface: any;
-        domainName: any;
+        domainNames: any;
         address: any;
         subnet: any;
     }, void, unknown>;
@@ -386,7 +387,7 @@ export class NetworkInterface extends Base {
     subnetForAddress(address: any): any;
     get gateway(): any;
     get gatewayAddress(): any;
-    get domainName(): any;
+    get domainNames(): any;
     get network_interface(): this;
     set network(network: any);
     get network(): any;