pmcf 2.6.7 → 2.7.0

package/package.json

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

package/src/dns-utils.mjs

@@ -2,6 +2,7 @@ import {
   asIterator,
   decodeIPv6,
   encodeIPv6,
+  isIPv6Address,
   normalizeIPAddress
 } from "./utils.mjs";
 
@@ -58,3 +59,22 @@ export function dnsMergeParameters(a, b) {
     ])
   );
 }
+
+export function reverseAddress(address) {
+  if (isIPv6Address(address)) {
+    return normalizeIPAddress(address)
+      .replaceAll(":", "")
+      .split("")
+      .reverse()
+      .join(".");
+  }
+
+  return address.split(".").reverse().join(".");
+}
+
+export function reverseArpaAddress(address) {
+  return (
+    reverseAddress(address) +
+    (isIPv6Address(address) ? ".ip6.arpa" : ".in-addr.arpa")
+  );
+}

package/src/host.mjs

@@ -107,6 +107,9 @@ export class Host extends Base {
     if (data.extends) {
       this.finalize(() => {
         for (const host of this.extends) {
+          if(host === this) {
+            this.error("Cant extend myself");
+          }
           host.execFinalize();
           this._applyExtends(host);
         }
@@ -123,6 +126,7 @@ export class Host extends Base {
       if (ni.isTemplate) {
       } else {
         let present = this._networkInterfaces.get(name);
+
         if (!present) {
           present = ni.forOwner(this);
           this._networkInterfaces.set(name, present);
@@ -517,9 +521,9 @@ export class NetworkInterface extends Base {
   _network;
   _kind;
   _hostName;
+  _hwaddr;
   extends = [];
   arpbridge;
-  hwaddr;
 
   constructor(owner, data) {
     super(owner, data);
@@ -634,7 +638,11 @@ export class NetworkInterface extends Base {
   }
 
   get network() {
-    return this._network ?? this.host.network;
+    return (
+      this._network ??
+      this.extends.find(i => i.network)?.network ??
+      this.host.network
+    );
   }
 
   set network(network) {
@@ -646,7 +654,20 @@ export class NetworkInterface extends Base {
   }
 
   get scope() {
-    return this._scope ?? this.network?.scope ?? "global";
+    return (
+      this._scope ??
+      this.extends.find(i => i.scope)?.scope ??
+      this.network?.scope ??
+      "global"
+    );
+  }
+
+  set hwaddr(value) {
+    this._hwaddr = value;
+  }
+
+  get hwaddr() {
+    return this._hwaddr ?? this.extends.find(i => i._hwaddr)?._hwaddr;
   }
 
   set metric(value) {
@@ -662,7 +683,9 @@ export class NetworkInterface extends Base {
   }
 
   get ssid() {
-    return this._ssid ?? this.network?.ssid;
+    return (
+      this._ssid ?? this.extends.find(i => i.ssid)?.ssid ?? this.network?.ssid
+    );
   }
 
   set psk(value) {
@@ -670,7 +693,7 @@ export class NetworkInterface extends Base {
   }
 
   get psk() {
-    return this._psk ?? this.network?.psk;
+    return this._psk ?? this.extends.find(i => i.psk)?.psk ?? this.network?.psk;
   }
 
   set kind(value) {
@@ -678,6 +701,8 @@ export class NetworkInterface extends Base {
   }
 
   get kind() {
-    return this._kind ?? this.network?.kind;
+    return (
+      this._kind ?? this.extends.find(i => i.kind)?.kind ?? this.network?.kind
+    );
   }
 }

package/src/services/dhcp.mjs

@@ -42,6 +42,11 @@ export class DHCPService extends Service {
 
     console.log("kea", host.name, network.name);
 
+    const dnsServerAddreses = serviceAddresses(network, {
+      type: "dns",
+      priority: "<10"
+    });
+
     const packageData = {
       dir,
       sources: [new FileContentProvider(dir + "/")[Symbol.asyncIterator]()],
@@ -111,6 +116,16 @@ export class DHCPService extends Service {
       }
     };
 
+    const dnsServersSlot = domains =>
+      domains.map(domain => {
+        return {
+          name: domain,
+          "dns-servers": dnsServerAddreses.map(address => {
+            return { "ip-address": address };
+          })
+        };
+      });
+
     const ddns = {
       DhcpDdns: {
         "ip-address": "127.0.0.1",
@@ -120,8 +135,14 @@ export class DHCPService extends Service {
           "socket-name": "/run/kea/ddns-ctrl-socket"
         },
         "tsig-keys": [],
-        "forward-ddns": {},
-        "reverse-ddns": {},
+        "forward-ddns": {
+          "ddns-domains": dnsServersSlot([...this.domains])
+        },
+        /*
+        "reverse-ddns": {
+          "ddns-domains": dnsSlot()
+        },
+        */
         loggers
       }
     };
@@ -171,10 +192,7 @@ export class DHCPService extends Service {
         "option-data": [
           {
             name: "domain-name-servers",
-            data: serviceAddresses(network, {
-              type: "dns",
-              priority: "<10"
-            }).join(",")
+            data: dnsServerAddreses.join(",")
           },
           {
             name: "domain-search",

package/src/services/dns.mjs

@@ -4,11 +4,10 @@ import { FileContentProvider } from "npm-pkgbuild";
 import {
   writeLines,
   isIPv6Address,
-  normalizeIPAddress,
   isLinkLocal,
   isLocalhost
 } from "../utils.mjs";
-import { DNSRecord, dnsFullName } from "../dns-utils.mjs";
+import { DNSRecord, dnsFullName, reverseArpaAddress } from "../dns-utils.mjs";
 import { addType } from "../types.mjs";
 import { ServiceTypeDefinition, serviceAddresses } from "../service.mjs";
 import {
@@ -457,22 +456,3 @@ async function generateZoneDefs(dns, location, packageData) {
     );
   }
 }
-
-export function reverseAddress(address) {
-  if (isIPv6Address(address)) {
-    return normalizeIPAddress(address)
-      .replaceAll(":", "")
-      .split("")
-      .reverse()
-      .join(".");
-  }
-
-  return address.split(".").reverse().join(".");
-}
-
-export function reverseArpaAddress(address) {
-  return (
-    reverseAddress(address) +
-    (isIPv6Address(address) ? ".ip6.arpa" : ".in-addr.arpa")
-  );
-}

package/types/dns-utils.d.mts

@@ -7,3 +7,5 @@ export function dnsFormatParameters(parameters: any): string;
 export function dnsMergeParameters(a: any, b: any): {
     [k: string]: Set<any>;
 };
+export function reverseAddress(address: any): any;
+export function reverseArpaAddress(address: any): string;

package/types/host.d.mts

@@ -412,9 +412,9 @@ export class NetworkInterface extends Base {
     _network: any;
     _kind: any;
     _hostName: any;
+    _hwaddr: any;
     extends: any[];
     arpbridge: any;
-    hwaddr: any;
     matches(other: any): boolean;
     addSubnet(address: any): any;
     set ipAddresses(value: Map<any, any>);
@@ -436,6 +436,8 @@ export class NetworkInterface extends Base {
     get network(): any;
     set scope(value: any);
     get scope(): any;
+    set hwaddr(value: any);
+    get hwaddr(): any;
     set metric(value: any);
     get metric(): any;
     set ssid(value: any);

package/types/services/dns.d.mts

@@ -1,5 +1,3 @@
-export function reverseAddress(address: any): any;
-export function reverseArpaAddress(address: any): string;
 export class DNSService extends ExtraSourceService {
     static get typeDefinition(): {
         name: string;