pmcf 2.64.2 → 2.64.4

package/package.json

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

package/src/network-interfaces/loopback.mjs

@@ -17,6 +17,8 @@ const _localAddresses = new Map([
   ["::1", SUBNET_LOCALHOST_IPV6]
 ]);
 
+const _localDomains = new Set(["localhost"]);
+
 export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
   static {
     addType(this);
@@ -40,7 +42,11 @@ export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
   }
 
   get localDomains() {
-    return new Set(["localhost"]);
+    return _localDomains;
+  }
+
+  get domainNames() {
+    return _localDomains;
   }
 
   get hostName() {

package/src/services/bind.mjs

@@ -232,8 +232,8 @@ export class BindService extends ExtraSourceService {
   async *preparePackages(dir) {
     const sources = this.addresses.length ? this.addresses : [this.owner];
     const names = sources.map(a => a.fullName).join(" ");
+    const name = this.owner.owner.name || this.owner.name;
 
-    const name = this.owner.owner.name;
     const configPackageDir = join(dir, "config") + "/";
     const packageData = {
       dir: configPackageDir,
@@ -442,78 +442,69 @@ export class BindService extends ExtraSourceService {
             !this.exclude.has(networkInterface.network) &&
             !this.excludeInterfaceKinds.has(networkInterface.kind)
           ) {
-            const host = networkInterface.host;
-            if (host) {
-              if (
-                !addresses.has(address) &&
-                (this.hasLinkLocalAdresses || !isLinkLocal(address))
-              ) {
-                addresses.add(address);
-
-                for (const domainName of domainNames) {
-                  zone.records.add(
-                    DNSRecord(
-                      dnsFullName(domainName),
-                      dnsRecordTypeForAddressFamily(family),
-                      address
-                    )
-                  );
-                }
-                if (subnet && host.domain === domain) {
-                  let reverseZone = reverseZones.get(subnet.address);
-
-                  if (!reverseZone) {
-                    const id = reverseArpa(subnet.prefix);
-                    reverseZone = {
-                      id,
-                      type: "plain",
-                      file: `${locationName}/${id}.zone`,
-                      records: new Set(this.defaultRecords)
-                    };
-                    config.zones.push(reverseZone);
-                    reverseZones.set(subnet.address, reverseZone);
-                  }
-
-                  for (const domainName of host.domainNames) {
-                    reverseZone.records.add(
-                      DNSRecord(
-                        dnsFullName(reverseArpa(address)),
-                        "PTR",
-                        dnsFullName(domainName)
-                      )
-                    );
-                  }
-                }
+            if (
+              !addresses.has(address) &&
+              (this.hasLinkLocalAdresses || !isLinkLocal(address))
+            ) {
+              addresses.add(address);
+
+              let reverseZone = reverseZones.get(subnet.address);
+
+              if (!reverseZone) {
+                const id = reverseArpa(subnet.prefix);
+                reverseZone = {
+                  id,
+                  type: "plain",
+                  file: `${locationName}/${id}.zone`,
+                  records: new Set(this.defaultRecords)
+                };
+                config.zones.push(reverseZone);
+                reverseZones.set(subnet.address, reverseZone);
               }
 
-              if (!hosts.has(host)) {
-                hosts.add(host);
-
-                for (const foreignDomainName of host.foreignDomainNames) {
-                  zone.records.add(
-                    DNSRecord(
-                      "outfacing",
-                      "PTR",
-                      dnsFullName(foreignDomainName)
-                    )
-                  );
-                }
+              for (const domainName of domainNames) {
+                zone.records.add(
+                  DNSRecord(
+                    dnsFullName(domainName),
+                    dnsRecordTypeForAddressFamily(family),
+                    address
+                  )
+                );
+
+                reverseZone.records.add(
+                  DNSRecord(
+                    dnsFullName(reverseArpa(address)),
+                    "PTR",
+                    dnsFullName(domainName)
+                  )
+                );
+              }
+            }
 
-                const sm = new Map();
+            const host = networkInterface.host;
+            if (host && !hosts.has(host)) {
+              hosts.add(host);
 
-                for (const service of host._services) {
-                  for (const record of service.dnsRecordsForDomainName(
-                    host.domainName,
-                    this.hasSVRRecords
-                  )) {
-                    sm.set(record.toString(), record);
-                  }
-                }
+              for (const foreignDomainName of host.foreignDomainNames) {
+                zone.records.add(
+                  DNSRecord("outfacing", "PTR", dnsFullName(foreignDomainName))
+                );
+              }
 
-                for (const r of sm.values()) {
-                  zone.records.add(r);
+              const sm = new Map();
+
+              for (const service of host._services) {
+                for (const record of service.dnsRecordsForDomainName(
+                  host.domainName,
+                  this.hasSVRRecords
+                )) {
+                  sm.set(record.toString(), record);
                 }
               }
+
+              for (const r of sm.values()) {
+                zone.records.add(r);
+              }
             }
           }
         }

package/types/network-interfaces/loopback.d.mts

@@ -324,6 +324,7 @@ export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
     get kind(): string;
     get scope(): string;
     get localDomains(): Set<string>;
+    get domainNames(): Set<string>;
     get hostName(): string;
     get ipAddresses(): Map<string, import("pmcf").Subnet>;
 }