pmcf 1.75.0 → 1.76.0

package/package.json

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

package/src/base.mjs

@@ -268,6 +268,10 @@ export class Base {
     return this.owner?.domain;
   }
 
+  get domains() {
+    return this.owner?.domains || new Set();;
+  }
+
   get administratorEmail() {
     return this.owner?.administratorEmail;
   }

package/src/dns.mjs

@@ -99,10 +99,6 @@ export class DNSService extends Base {
     }
   }
 
-  get domains() {
-    return [this.owner.domain];
-  }
-
   async resolvedConfig() {
     return {
       DNS: serviceAddresses(this, {
@@ -113,7 +109,7 @@ export class DNSService extends Base {
         ...DNS_SERVICE_FILTER,
         priority: ">=10"
       }).join(" "),
-      Domains: this.domains.join(" "),
+      Domains: [...this.domains].join(" "),
       DNSSEC: "no",
       MulticastDNS: "yes",
       LLMNR: "no"
@@ -217,7 +213,7 @@ async function generateZoneDefs(dns, targetDir) {
       );
     }
 
-    console.log(`${nameService}`,nameService.ipAddressOrDomainName);
+    console.log(`${nameService}`, nameService.ipAddressOrDomainName);
     //console.log(dns.owner.fullName, domain, nameService.domainName, rname);
     const reverseZones = new Map();
 
@@ -229,7 +225,11 @@ async function generateZoneDefs(dns, targetDir) {
       `(${updates})`
     );
 
-    const NSRecord = createRecord("@", "NS", fullName(nameService.ipAddressOrDomainName));
+    const NSRecord = createRecord(
+      "@",
+      "NS",
+      fullName(nameService.ipAddressOrDomainName)
+    );
 
     const zone = {
       id: domain,
@@ -268,65 +268,70 @@ async function generateZoneDefs(dns, targetDir) {
       networkInterface
     } of dns.owner.networkAddresses()) {
       const host = networkInterface.host;
+      const domainName = host.domainNameIn(domain);
 
-      if (
-        !addresses.has(address) &&
-        (dns.hasLinkLocalAdresses || !isLinkLocal(address))
-      ) {
-        addresses.add(address);
+      if (domainName) {
+        if (
+          !addresses.has(address) &&
+          (dns.hasLinkLocalAdresses || !isLinkLocal(address))
+        ) {
+          addresses.add(address);
 
-        zone.records.add(
-          createRecord(
-            fullName(host.domainName),
-            isIPv6Address(address) ? "AAAA" : "A",
-            normalizeIPAddress(address)
-          )
-        );
-
-        if (subnet) {
-          let reverseZone = reverseZones.get(subnet.address);
-
-          if (!reverseZone) {
-            const reverseArpa = reverseArpaAddress(subnet.prefix);
-            reverseZone = {
-              id: reverseArpa,
-              type: "plain",
-              file: `${dns.owner.name}/${reverseArpa}.zone`,
-              records: new Set([SOARecord, NSRecord])
-            };
-            zones.push(reverseZone);
-            reverseZones.set(subnet.address, reverseZone);
-          }
-          reverseZone.records.add(
+          zone.records.add(
             createRecord(
-              fullName(reverseArpaAddress(address)),
-              "PTR",
-              fullName(host.domainName)
+              fullName(domainName),
+              isIPv6Address(address) ? "AAAA" : "A",
+              normalizeIPAddress(address)
             )
           );
-        }
-      }
-
-      if (!hosts.has(host)) {
-        hosts.add(host);
-        for (const service of host.findServices()) {
-          if (service.master && service.alias) {
-            zone.records.add(
-              createRecord(service.alias, "CNAME", fullName(host.domainName))
-            );
+          if (subnet && host.domain === domain) {
+            let reverseZone = reverseZones.get(subnet.address);
+
+            if (!reverseZone) {
+              const reverseArpa = reverseArpaAddress(subnet.prefix);
+              reverseZone = {
+                id: reverseArpa,
+                type: "plain",
+                file: `${dns.owner.name}/${reverseArpa}.zone`,
+                records: new Set([SOARecord, NSRecord])
+              };
+              zones.push(reverseZone);
+              reverseZones.set(subnet.address, reverseZone);
+            }
+
+            for (const domainName of host.domainNames) {
+              reverseZone.records.add(
+                createRecord(
+                  fullName(reverseArpaAddress(address)),
+                  "PTR",
+                  fullName(domainName)
+                )
+              );
+            }
           }
+        }
 
-          if (dns.hasSVRRecords && service.srvPrefix) {
-            zone.records.add(
-              createRecord(
-                fullName(`${service.srvPrefix}.${host.domainName}`),
-                "SRV",
-                service.priority,
-                service.weight,
-                service.port,
-                fullName(host.domainName)
-              )
-            );
+        if (!hosts.has(host)) {
+          hosts.add(host);
+          for (const service of host.findServices()) {
+            if (service.master && service.alias) {
+              zone.records.add(
+                createRecord(service.alias, "CNAME", fullName(domainName))
+              );
+            }
+
+            if (dns.hasSVRRecords && service.srvPrefix) {
+              zone.records.add(
+                createRecord(
+                  fullName(`${service.srvPrefix}.${domainName}`),
+                  "SRV",
+                  service.priority,
+                  service.weight,
+                  service.port,
+                  fullName(host.domainName)
+                )
+              );
+            }
           }
         }
       }

package/src/host.mjs

@@ -12,7 +12,8 @@ import {
   isIPv6Address,
   normalizeIPAddress,
   formatCIDR,
-  hasWellKnownSubnet
+  hasWellKnownSubnet,
+  domainFromDominName
 } from "./utils.mjs";
 import { objectFilter } from "./filter.mjs";
 import { addType, types } from "./types.mjs";
@@ -36,7 +37,7 @@ const HostTypeDefinition = {
       writeable: true
     },
     services: { type: "service", collection: true, writeable: true },
-    aliases: { type: "string", collection: false, writeable: true },
+    aliases: { type: "string", collection: true, writeable: true },
 
     os: { type: "string", collection: false, writeable: true },
     "machine-id": { type: "string", collection: false, writeable: true },
@@ -255,11 +256,7 @@ export class Host extends Base {
 
   get domains() {
     const domains = new Set(
-      [...this.aliases].map(n => {
-        const p = n.split(".");
-        p.shift();
-        return p.join(".");
-      })
+      [...this.aliases].map(n => domainFromDominName(n, this.domain))
     );
     domains.add(this.domain);
     return domains;
@@ -275,6 +272,14 @@ export class Host extends Base {
     return domain ? hostName + "." + domain : hostName;
   }
 
+  domainNameIn(domain) {
+    for (const domainName of this.domainNames) {
+      if (domain == domainFromDominName(domainName)) {
+        return domainName;
+      }
+    }
+  }
+
   get host() {
     return this;
   }

package/src/owner.mjs

@@ -356,9 +356,13 @@ export class Owner extends Base {
     return this.#domain || this.owner?.domain;
   }
 
-  *domains() {
-    for (const location of this.locations()) {
-      yield location.domain;
+  get domains() {
+    let domains = new Set();
+
+    for (const object of this.hosts()) {
+      domains = domains.union(object.domains);
     }
+
+    return domains;
   }
 }

package/src/utils.mjs

@@ -1,10 +1,23 @@
 import { writeFile, mkdir } from "node:fs/promises";
 import { join, dirname, basename } from "node:path";
 
+export function domainFromDominName(domainName, defaultDomain) {
+  const dcs = domainName.split(".");
+
+  if (dcs.length > 1) {
+    dcs.shift();
+    return dcs.join(".");
+  }
+
+  return defaultDomain;
+}
+
 export async function writeLines(dir, name, lines) {
-  switch(typeof lines) {
-    case "undefined": return;
-    case "string": lines = [lines];
+  switch (typeof lines) {
+    case "undefined":
+      return;
+    case "string":
+      lines = [lines];
   }
 
   const full = join(dir, name);

package/types/base.d.mts

@@ -58,6 +58,7 @@ export class Base {
     get host(): any;
     get network(): any;
     get domain(): any;
+    get domains(): any;
     get administratorEmail(): any;
     get locales(): any;
     get country(): any;

package/types/dns.d.mts

@@ -83,7 +83,6 @@ export class DNSService extends Base {
     get trusted(): any[];
     set forwardsTo(value: any[]);
     get forwardsTo(): any[];
-    get domains(): any[];
     resolvedConfig(): Promise<{
         DNS: string;
         FallbackDNS: string;

package/types/host.d.mts

@@ -188,6 +188,7 @@ export class Host extends Base {
     get domains(): Set<any>;
     get domainNames(): any[];
     get domainName(): string;
+    domainNameIn(domain: any): any;
     get host(): this;
     named(name: any): any;
     set networkInterfaces(networkInterface: Map<any, any>);

package/types/owner.d.mts

@@ -220,7 +220,7 @@ export class Owner extends Base {
     get administratorEmail(): any;
     set domain(value: any);
     get domain(): any;
-    domains(): Generator<any, void, unknown>;
+    get domains(): Set<any>;
     #private;
 }
 import { Base } from "./base.mjs";

package/types/utils.d.mts

@@ -1,3 +1,4 @@
+export function domainFromDominName(domainName: any, defaultDomain: any): any;
 export function writeLines(dir: any, name: any, lines: any): Promise<void>;
 export function sectionLines(sectionName: any, values: any): string[];
 export function bridgeToJSON(bridge: any): any[];