pmcf 1.98.0 → 1.98.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.98.0",
+  "version": "1.98.2",
   "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,27 @@ export class DHCPService extends Base {
       }
     };
 
+    const commonConfig = {
+      "interfaces-config": {
+        interfaces: ["end0"]
+      },
+      "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,15 +129,14 @@ 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);
+        if (!hostNames.has(networkInterface.hostName)) {
+          hwmap.set(networkInterface.hwaddr, networkInterface);
+          hostNames.add(networkInterface.hostName);
+        }
       }
     }
 
@@ -130,28 +150,11 @@ export class DHCPService extends Base {
 
     const dhcp4 = {
       Dhcp4: {
-        "interfaces-config": {
-          interfaces: ["end0"]
-        },
+        ...commonConfig,
         "control-socket": {
           "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",
@@ -183,8 +186,6 @@ export class DHCPService extends Base {
             reservations /*: [
               {
                 "client-id": "01:11:22:33:44:55:66",
-                "ip-address": "192.168.1.198",
-                hostname: "special-snowflake"
               }
             ]*/
           }
@@ -194,29 +195,12 @@ export class DHCPService extends Base {
     };
     const dhcp6 = {
       Dhcp6: {
-        "interfaces-config": {
-          interfaces: []
-        },
+        ...commonConfig,
         "control-socket": {
           "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,28 @@ 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) {
+    for (const service of host.services) {
+      this.services = service.forOwner(this);
+    }
+
+    for (const [name, ni] of host.networkInterfaces) {
+      let present = this.#networkInterfaces.get(name);
+      if (!present) {
+        present = ni.forOwner(this);
+        this.#networkInterfaces.set(name, present);
+      }
+
+      present.extends.push(ni);
+    }
+  }
+
   _traverse(...args) {
     if (super._traverse(...args)) {
       for (const ni of this.networkInterfaces.values()) {
@@ -482,6 +492,7 @@ export class NetworkInterface extends Base {
   #network;
   #kind;
   #hostName;
+  extends = [];
   arpbridge;
   hwaddr;
 
@@ -490,6 +501,17 @@ export class NetworkInterface extends Base {
     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)) {

package/types/host.d.mts

@@ -169,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;
@@ -195,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);
@@ -377,6 +378,7 @@ export class NetworkInterface extends Base {
             };
         };
     };
+    extends: any[];
     arpbridge: any;
     hwaddr: any;
     addSubnet(address: any): any;