pmcf 1.97.1 → 1.98.1

package/package.json

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

package/src/dhcp.mjs

@@ -45,6 +45,24 @@ export class DHCPService extends Base {
       }
     };
 
+    const commonConfig = {
+      "lease-database": {
+        type: "memfile",
+        "lfc-interval": 3600
+      },
+      "expired-leases-processing": {
+        "reclaim-timer-wait-time": 10,
+        "flush-reclaimed-timer-wait-time": 25,
+        "hold-reclaimed-time": 3600,
+        "max-reclaim-leases": 100,
+        "max-reclaim-time": 250,
+        "unwarned-reclaim-cycles": 5
+      },
+      "renew-timer": 900,
+      "rebind-timer": 1800,
+      "valid-lifetime": 3600
+    };
+
     const loggers = [
       {
         "output-options": [
@@ -108,24 +126,28 @@ export class DHCPService extends Base {
 */
 
     const hwmap = new Map();
+    const hostNames = new Set();
 
-    for await (const {
-      networkInterface,
-      address,
-      subnet,
-      domainNames
-    } of this.owner.networkAddresses()) {
+    for await (const { networkInterface } of this.owner.networkAddresses()) {
       if (networkInterface.hwaddr) {
-        hwmap.set(networkInterface.hwaddr, networkInterface.rawAddress);
+        if (!hostNames.has(networkInterface.hostName)) {
+          hwmap.set(networkInterface.hwaddr, networkInterface);
+          hostNames.add(networkInterface.hostName);
+        }
       }
     }
 
-    const reservations = [...hwmap].map(([k, v]) => {
-      return { "hw-address": k, "ip-address": v };
+    const reservations = [...hwmap].map(([k, networkInterface]) => {
+      return {
+        "hw-address": k,
+        "ip-address": networkInterface.rawAddress,
+        hostname: networkInterface.hostName
+      };
     });
 
     const dhcp4 = {
       Dhcp4: {
+        ...commonConfig,
         "interfaces-config": {
           interfaces: ["end0"]
         },
@@ -133,21 +155,6 @@ export class DHCPService extends Base {
           "socket-type": "unix",
           "socket-name": "/run/kea/4-ctrl-socket"
         },
-        "lease-database": {
-          type: "memfile",
-          "lfc-interval": 3600
-        },
-        "expired-leases-processing": {
-          "reclaim-timer-wait-time": 10,
-          "flush-reclaimed-timer-wait-time": 25,
-          "hold-reclaimed-time": 3600,
-          "max-reclaim-leases": 100,
-          "max-reclaim-time": 250,
-          "unwarned-reclaim-cycles": 5
-        },
-        "renew-timer": 900,
-        "rebind-timer": 1800,
-        "valid-lifetime": 3600,
         "option-data": [
           {
             name: "domain-name-servers",
@@ -177,14 +184,8 @@ export class DHCPService extends Base {
               }
             ],
             reservations /*: [
-              {
-                "hw-address": "1a:1b:1c:1d:1e:1f",
-                "ip-address": "192.168.1.199"
-              },
               {
                 "client-id": "01:11:22:33:44:55:66",
-                "ip-address": "192.168.1.198",
-                hostname: "special-snowflake"
               }
             ]*/
           }
@@ -194,6 +195,7 @@ export class DHCPService extends Base {
     };
     const dhcp6 = {
       Dhcp6: {
+        ...commonConfig,
         "interfaces-config": {
           interfaces: []
         },
@@ -201,22 +203,7 @@ export class DHCPService extends Base {
           "socket-type": "unix",
           "socket-name": "/run/kea/6-ctrl-socket"
         },
-        "lease-database": {
-          type: "memfile",
-          "lfc-interval": 3600
-        },
-        "expired-leases-processing": {
-          "reclaim-timer-wait-time": 10,
-          "flush-reclaimed-timer-wait-time": 25,
-          "hold-reclaimed-time": 3600,
-          "max-reclaim-leases": 100,
-          "max-reclaim-time": 250,
-          "unwarned-reclaim-cycles": 5
-        },
-        "renew-timer": 1000,
-        "rebind-timer": 2000,
         "preferred-lifetime": 3000,
-        "valid-lifetime": 4000,
         "option-data": [
           {
             name: "dns-servers",

package/src/host.mjs

@@ -96,18 +96,32 @@ export class Host extends Base {
       this.finalize(() => {
         for (const host of this.extends) {
           host.execFinalize();
-          this.depends = host.depends;
-          this.provides = host.provides;
-          this.replaces = host.replaces;
-
-          for (const service of host.services) {
-            this.services = service.forOwner(this);
-          }
+          this._applyExtends(host);
         }
       });
     }
   }
 
+  _applyExtends(host) {
+    /*  this.depends = host.depends;
+    this.provides = host.provides;
+    this.replaces = host.replaces;
+*/
+    for (const service of host.services) {
+      this.services = service.forOwner(this);
+    }
+
+    for (const [name, ni] of host.networkInterfaces) {
+      const present = this.#networkInterfaces.get(name);
+      if (present) {
+        this.info("ALREADY THERE", name);
+      } else {
+        this.info("CLONE NI", name);
+        this.#networkInterfaces.set(name, ni.forOwner(this));
+      }
+    }
+  }
+
   _traverse(...args) {
     if (super._traverse(...args)) {
       for (const ni of this.networkInterfaces.values()) {
@@ -481,15 +495,26 @@ export class NetworkInterface extends Base {
   #psk;
   #network;
   #kind;
+  #hostName;
   arpbridge;
   hwaddr;
-  hostName;
 
   constructor(owner, data) {
     super(owner, data);
     this.read(data, NetworkInterfaceTypeDefinition);
   }
 
+  forOwner(owner) {
+    if (this.owner !== owner) {
+      const data = { name: this.name };
+
+      // @ts-ignore
+      return new this.constructor(owner, data);
+    }
+
+    return this;
+  }
+
   addSubnet(address) {
     if (!this.network) {
       if (!hasWellKnownSubnet(address)) {
@@ -562,6 +587,14 @@ export class NetworkInterface extends Base {
     }
   }
 
+  get hostName() {
+    return this.#hostName || this.host.hostName;
+  }
+
+  set hostName(value) {
+    this.#hostName = value;
+  }
+
   get domainNames() {
     return this.hostName
       ? new Set([[this.hostName, this.host.domain].join(".")])

package/src/network-support.mjs

@@ -9,6 +9,7 @@ export const networkProperties = {
 };
 
 export const networkAddressProperties = {
+  hostName: { type: "string", collection: false, writeable: true },
   cidrAddresses: { type: "string", collection: true, writeable: false },
   cidrAddress: { type: "string", collection: false, writeable: false },
   rawAddresses: { type: "string", collection: true, writeable: false },

package/types/cluster.d.mts

@@ -383,6 +383,11 @@ export class Cluster extends Host {
                     collection: boolean;
                     writeable: boolean;
                 };
+                hostName: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 cidrAddresses: {
                     type: string;
                     collection: boolean;

package/types/host.d.mts

@@ -141,6 +141,11 @@ export class Host extends Base {
                 collection: boolean;
                 writeable: boolean;
             };
+            hostName: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
             cidrAddresses: {
                 type: string;
                 collection: boolean;
@@ -164,12 +169,7 @@ export class Host extends Base {
         };
     };
     priority: number;
-    set depends(value: any);
-    get depends(): any;
-    set provides(value: any);
-    get provides(): any;
-    set replaces(value: any);
-    get replaces(): any;
+    _applyExtends(host: any): void;
     set services(service: any[]);
     get services(): any[];
     _traverse(...args: any[]): boolean;
@@ -190,6 +190,12 @@ export class Host extends Base {
     get aliases(): any;
     set extends(value: any[]);
     get extends(): any[];
+    set provides(value: any);
+    get provides(): any;
+    set replaces(value: any);
+    get replaces(): any;
+    set depends(value: any);
+    get depends(): any;
     set master(value: boolean);
     get master(): boolean;
     set os(value: any);
@@ -374,7 +380,6 @@ export class NetworkInterface extends Base {
     };
     arpbridge: any;
     hwaddr: any;
-    hostName: any;
     addSubnet(address: any): any;
     set ipAddresses(value: Map<any, any>);
     get ipAddresses(): Map<any, any>;
@@ -387,6 +392,8 @@ export class NetworkInterface extends Base {
     subnetForAddress(address: any): any;
     get gateway(): any;
     get gatewayAddress(): any;
+    set hostName(value: any);
+    get hostName(): any;
     get domainNames(): any;
     get network_interface(): this;
     set network(network: any);

package/types/network-support.d.mts

@@ -54,7 +54,7 @@ export namespace networkProperties {
     }
 }
 export namespace networkAddressProperties {
-    namespace cidrAddresses {
+    namespace hostName {
         let type_7: string;
         export { type_7 as type };
         let collection_7: boolean;
@@ -62,7 +62,7 @@ export namespace networkAddressProperties {
         let writeable_7: boolean;
         export { writeable_7 as writeable };
     }
-    namespace cidrAddress {
+    namespace cidrAddresses {
         let type_8: string;
         export { type_8 as type };
         let collection_8: boolean;
@@ -70,7 +70,7 @@ export namespace networkAddressProperties {
         let writeable_8: boolean;
         export { writeable_8 as writeable };
     }
-    namespace rawAddresses {
+    namespace cidrAddress {
         let type_9: string;
         export { type_9 as type };
         let collection_9: boolean;
@@ -78,7 +78,7 @@ export namespace networkAddressProperties {
         let writeable_9: boolean;
         export { writeable_9 as writeable };
     }
-    namespace rawAddress {
+    namespace rawAddresses {
         let type_10: string;
         export { type_10 as type };
         let collection_10: boolean;
@@ -86,4 +86,12 @@ export namespace networkAddressProperties {
         let writeable_10: boolean;
         export { writeable_10 as writeable };
     }
+    namespace rawAddress {
+        let type_11: string;
+        export { type_11 as type };
+        let collection_11: boolean;
+        export { collection_11 as collection };
+        let writeable_11: boolean;
+        export { writeable_11 as writeable };
+    }
 }

package/types/service.d.mts

@@ -102,6 +102,11 @@ export class Service extends Base {
                 collection: boolean;
                 writeable: boolean;
             };
+            hostName: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
             cidrAddresses: {
                 type: string;
                 collection: boolean;