pmcf 1.93.0 → 1.94.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.93.0",
+  "version": "1.94.1",
   "publishConfig": {
     "access": "public"
   },
@@ -43,7 +43,7 @@
     "pkg-dir": "^8.0.0"
   },
   "devDependencies": {
-    "@types/node": "^22.13.10",
+    "@types/node": "^22.13.11",
     "ava": "^6.2.0",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",

package/src/dns.mjs

@@ -288,7 +288,7 @@ async function generateZoneDefs(dns, packageData) {
     };
     configs.push(config);
 
-    const locationRecord = DNSRecord("location", "TXT", dns.location.name)
+    const locationRecord = DNSRecord("location", "TXT", dns.location.name);
 
     const zone = {
       id: domain,
@@ -322,68 +322,65 @@ async function generateZoneDefs(dns, packageData) {
     for await (const {
       address,
       subnet,
-      networkInterface
+      networkInterface,
+      domainName
     } 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(
+          DNSRecord(
+            dnsFullName(domainName),
+            isIPv6Address(address) ? "AAAA" : "A",
+            normalizeIPAddress(address)
+          )
+        );
+        if (subnet && host.domain === domain) {
+          let reverseZone = reverseZones.get(subnet.address);
+
+          if (!reverseZone) {
+            const reverseArpa = reverseArpaAddress(subnet.prefix);
+            reverseZone = {
+              id: reverseArpa,
+              type: "plain",
+              file: `${ownerName}/${reverseArpa}.zone`,
+              records: new Set([SOARecord, NSRecord])
+            };
+            config.zones.push(reverseZone);
+            reverseZones.set(subnet.address, reverseZone);
+          }
 
-          zone.records.add(
-            DNSRecord(
-              dnsFullName(domainName),
-              isIPv6Address(address) ? "AAAA" : "A",
-              normalizeIPAddress(address)
-            )
-          );
-          if (subnet && host.domain === domain) {
-            let reverseZone = reverseZones.get(subnet.address);
-
-            if (!reverseZone) {
-              const reverseArpa = reverseArpaAddress(subnet.prefix);
-              reverseZone = {
-                id: reverseArpa,
-                type: "plain",
-                file: `${ownerName}/${reverseArpa}.zone`,
-                records: new Set([SOARecord, NSRecord])
-              };
-              config.zones.push(reverseZone);
-              reverseZones.set(subnet.address, reverseZone);
-            }
-
-            for (const domainName of host.domainNames) {
-              reverseZone.records.add(
-                DNSRecord(
-                  dnsFullName(reverseArpaAddress(address)),
-                  "PTR",
-                  dnsFullName(domainName)
-                )
-              );
-            }
+          for (const domainName of host.domainNames) {
+            reverseZone.records.add(
+              DNSRecord(
+                dnsFullName(reverseArpaAddress(address)),
+                "PTR",
+                dnsFullName(domainName)
+              )
+            );
           }
         }
+      }
 
-        if (!hosts.has(host)) {
-          hosts.add(host);
+      if (!hosts.has(host)) {
+        hosts.add(host);
 
-          for (const foreignDomainName of host.foreignDomainNames) {
-            zone.records.add(
-              DNSRecord("external", "PTR", dnsFullName(foreignDomainName))
-            );
-          }
+        for (const foreignDomainName of host.foreignDomainNames) {
+          zone.records.add(
+            DNSRecord("external", "PTR", dnsFullName(foreignDomainName))
+          );
+        }
 
-          for (const service of host.findServices()) {
-            for (const record of service.dnsRecordsForDomainName(
-              domainName,
-              dns.hasSVRRecords
-            )) {
-              zone.records.add(record);
-            }
+        for (const service of host.findServices()) {
+          for (const record of service.dnsRecordsForDomainName(
+            domainName,
+            dns.hasSVRRecords
+          )) {
+            zone.records.add(record);
           }
         }
       }

package/src/host.mjs

@@ -18,7 +18,7 @@ import {
 } from "./utils.mjs";
 import { objectFilter } from "./filter.mjs";
 import { addType, types } from "./types.mjs";
-import { loadHooks } from "./hooks.mjs";
+import { loadHooks } from "./hooks.mjs";
 import {
   generateNetworkDefs,
   generateMachineInfo,
@@ -187,7 +187,7 @@ export class Host extends Base {
   }
 
   get aliases() {
-    return this.#aliases;
+    return this.extends.reduce((a, c) => a.union(c.aliases), this.#aliases);
   }
 
   set extends(value) {
@@ -282,8 +282,12 @@ export class Host extends Base {
   }
 
   get domainNames() {
-    return [this.hostName, ...this.aliases].map(n =>
-      domainName(n, this.domain)
+    return new Set(
+      [
+        ...[...this.networkInterfaces.values()].map(ni => ni.domainName),
+        this.hostName,
+        ...this.aliases
+      ].map(n => domainName(n, this.domain))
     );
   }
 
@@ -291,10 +295,10 @@ export class Host extends Base {
     return domainName(this.hostName, this.domain);
   }
 
-  domainNameIn(domain) {
+  *domainNamesIn(domain) {
     for (const domainName of this.domainNames) {
-      if (domain == domainFromDominName(domainName)) {
-        return domainName;
+      if (domain === domainFromDominName(domainName)) {
+        yield domainName;
       }
     }
   }
@@ -361,10 +365,10 @@ export class Host extends Base {
 
   *networkAddresses() {
     for (const networkInterface of this.networkInterfaces.values()) {
-      for (const [address, subnet, domainName] of networkInterface.ipAddresses) {
+      for (const [address, subnet] of networkInterface.ipAddresses) {
         yield {
           networkInterface,
-          domainName,
+          domainName: networkInterface.domainName,
           address,
           subnet
         };
@@ -397,9 +401,7 @@ export class Host extends Base {
   async *preparePackages(dir) {
     const packageData = {
       dir,
-      sources: [
-        new FileContentProvider(dir + "/")[Symbol.asyncIterator]()
-      ],
+      sources: [new FileContentProvider(dir + "/")[Symbol.asyncIterator]()],
       outputs: this.outputs,
       properties: {
         name: `${this.typeName}-${this.owner.name}-${this.name}`,
@@ -412,7 +414,8 @@ export class Host extends Base {
         provides: [...this.provides],
         replaces: [`mf-${this.hostName}`, ...this.replaces],
         backup: "root/.ssh/known_hosts",
-        hooks: await loadHooks({},
+        hooks: await loadHooks(
+          {},
           new URL("host.install", import.meta.url).pathname
         )
       }
@@ -421,10 +424,7 @@ export class Host extends Base {
     await generateNetworkDefs(this, packageData);
     await generateMachineInfo(this, packageData);
     await copySshKeys(this, packageData);
-    await generateKnownHosts(
-      this.owner.hosts(),
-      join(dir, "root", ".ssh")
-    );
+    await generateKnownHosts(this.owner.hosts(), join(dir, "root", ".ssh"));
 
     yield packageData;
   }
@@ -545,9 +545,10 @@ export class NetworkInterface extends Base {
     }
   }
 
-  get domainName()
-  {
-    return this.hostName ? [this.hostName,this.host.domain].join('.') : this.host.dmainName;
+  get domainName() {
+    return this.hostName
+      ? [this.hostName, this.host.domain].join(".")
+      : this.host.domainName;
   }
 
   get host() {

package/src/utils.mjs

@@ -2,6 +2,11 @@ import { writeFile, mkdir } from "node:fs/promises";
 import { join, dirname, basename } from "node:path";
 
 export function domainName(name, defaultDomain) {
+
+  if(typeof name != "string") {
+    console.log(name);
+  }
+
   const dcs = name.split(".");
   return defaultDomain === undefined || dcs.length > 1
     ? name
@@ -80,6 +85,11 @@ export function isIPv4Address(address) {
   return address.indexOf(".") >= 0;
 }
 
+export function generateEU64(mac)
+{
+ //TODO
+}
+
 export function isIPv6Address(address) {
   return address.indexOf(":") >= 0;
 }

package/types/host.d.mts

@@ -185,8 +185,8 @@ export class Host extends Base {
     get isTemplate(): true | RegExpMatchArray;
     get isModel(): boolean;
     get model(): any;
-    set aliases(value: Set<any>);
-    get aliases(): Set<any>;
+    set aliases(value: any);
+    get aliases(): any;
     set extends(value: any[]);
     get extends(): any[];
     set master(value: boolean);
@@ -200,9 +200,9 @@ export class Host extends Base {
     get foreignDomainNames(): any[];
     get foreignDomains(): Set<any>;
     get domains(): Set<any>;
-    get domainNames(): any[];
+    get domainNames(): Set<any>;
     get domainName(): any;
-    domainNameIn(domain: any): any;
+    domainNamesIn(domain: any): Generator<any, void, unknown>;
     get host(): this;
     named(name: any): any;
     set networkInterfaces(networkInterface: Map<any, any>);

package/types/utils.d.mts

@@ -6,6 +6,7 @@ export function bridgeToJSON(bridge: any): any[];
 export function asArray(value: any): any[];
 export function asIterator(value: any): any;
 export function isIPv4Address(address: any): boolean;
+export function generateEU64(mac: any): void;
 export function isIPv6Address(address: any): boolean;
 export function isLinkLocal(address: any): any;
 export function normalizeIPAddress(address: any): any;