pmcf 2.4.1 → 2.5.0

package/package.json

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

package/src/host.mjs

@@ -385,6 +385,24 @@ export class Host extends Base {
     }
   }
 
+  get network() {
+    for (const ni of this.networkInterfaces.values()) {
+      if (ni._kind !== "loopback" && ni._network) {
+        return ni._network;
+      }
+    }
+
+    return super.network;
+  }
+
+  get networks() {
+    return new Set(
+      [...this.networkInterfaces.values()]
+        .filter(ni => ni._network)
+        .map(ni => ni._network)
+    );
+  }
+
   get networkInterfaces() {
     return this._networkInterfaces;
   }

package/src/owner.mjs

@@ -137,28 +137,20 @@ export class Owner extends Base {
     return this.typeNamed("host", name) || this.typeNamed("cluster", name);
   }
 
-  *hosts() {
-    const hosts = new Set();
+  hosts() {
+    let hosts = new Set();
 
     for (const type of ["host", "cluster"]) {
-      for (const host of this.typeList(type)) {
-        if (!hosts.has(host)) {
-          hosts.add(host);
-          yield host;
-        }
-      }
+      hosts = hosts.union(new Set(Array.from(this.typeList(type))));
     }
 
     for (const type of types.host.owners) {
       for (const object of this.typeList(type)) {
-        for (const host of object.hosts()) {
-          if (!hosts.has(host)) {
-            hosts.add(host);
-            yield host;
-          }
-        }
+        hosts = hosts.union(object.hosts());
       }
     }
+
+    return hosts;
   }
 
   networkNamed(name) {
@@ -179,7 +171,7 @@ export class Owner extends Base {
     }
     yield* this.typeList("subnet");
 
-   /* for (const network of this.networks()) {
+    /* for (const network of this.networks()) {
       yield* network.subnets();
     }*/
   }

package/src/services/dhcp.mjs

@@ -39,6 +39,9 @@ export class DHCPService extends Service {
     const network = this.network;
     const host = this.server;
     const name = host.name;
+
+    console.log("kea", host.name, network.name);
+
     const packageData = {
       dir,
       sources: [new FileContentProvider(dir + "/")[Symbol.asyncIterator]()],
@@ -54,7 +57,9 @@ export class DHCPService extends Service {
 
     const commonConfig = {
       "interfaces-config": {
-        interfaces: [...host.networkInterfaces.values()].filter(ni=>ni.kind !== 'loopback').map(ni => ni.name)
+        interfaces: [...host.networkInterfaces.values()]
+          .filter(ni => ni.kind !== "loopback")
+          .map(ni => ni.name)
       },
       "lease-database": {
         type: "memfile",
@@ -164,7 +169,7 @@ export class DHCPService extends Service {
         "option-data": [
           {
             name: "domain-name-servers",
-            data: serviceAddresses(this, {
+            data: serviceAddresses(network, {
               type: "dns",
               priority: "<10"
             }).join(",")

package/types/host.d.mts

@@ -227,6 +227,7 @@ export class Host extends Base {
     domainNamesIn(domain: any): Generator<any, void, unknown>;
     get host(): this;
     named(name: any): any;
+    get networks(): Set<any>;
     set networkInterfaces(networkInterface: Map<any, any>);
     get networkInterfaces(): Map<any, any>;
     networkAddresses(): Generator<{

package/types/owner.d.mts

@@ -142,7 +142,7 @@ export class Owner extends Base {
     locationNamed(name: any): any;
     locations(): any;
     hostNamed(name: any): any;
-    hosts(): Generator<any, void, unknown>;
+    hosts(): Set<any>;
     networkNamed(name: any): any;
     networks(): any;
     subnetNamed(name: any): any;