pmcf 2.46.4 → 2.47.1

package/package.json

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

package/src/host.mjs

@@ -452,10 +452,16 @@ export class Host extends ServiceOwner {
     return addresses(this.networkAddresses());
   }
 
-  *subnets() {
+  get subnets() {
+    const sn = new Set();
+
     for (const networkInterface of this.networkInterfaces.values()) {
-      yield* networkInterface.subnets();
+      for (const s of networkInterface.subnets()) {
+        sn.add(s);
+      }
     }
+
+    return sn;
   }
 
   async publicKey(type = "ed25519") {

package/src/service.mjs

@@ -188,6 +188,10 @@ export class Service extends Base {
     return this.host.networks;
   }
 
+  get subnets() {
+    return this.host.subnets;
+  }
+
   endpoints(filter) {
     const data = serviceTypeEndpoints(this.type);
 

package/src/services/dhcp.mjs

@@ -4,7 +4,9 @@ import {
   Service,
   ServiceTypeDefinition,
   Endpoint,
-  serviceEndpoints
+  serviceEndpoints,
+  SUBNET_LOCALHOST_IPV4,
+  SUBNET_LOCALHOST_IPV6
 } from "pmcf";
 import { addType } from "../types.mjs";
 import { writeLines } from "../utils.mjs";
@@ -187,14 +189,6 @@ export class DHCPService extends Service {
       "ncr-format": "JSON"
     };
 
-    const subnets = new Set();
-
-    for (const network of this.networks) {
-      for (const subnet of network.subnets()) {
-        subnets.add(subnet);
-      }
-    }
-
     const hwmap = new Map();
     const hostNames = new Set();
 
@@ -229,6 +223,7 @@ export class DHCPService extends Service {
         endpoint => `${endpoint.networkInterface.name}/${endpoint.address}`
       );
 
+    const subnets = [...this.subnets].filter(s => s !== SUBNET_LOCALHOST_IPV4 && s !== SUBNET_LOCALHOST_IPV6/* s.address !== "127/8"*/); // TODO no localhost
     const dhcp4 = {
       Dhcp4: {
         ...commonConfig,
@@ -252,7 +247,7 @@ export class DHCPService extends Service {
             data: [...this.domains].join(",")
           }
         ],
-        subnet4: [...subnets]
+        subnet4: subnets
           .filter(s => s.family === "IPv4")
           .map((subnet, index) => {
             return {
@@ -292,7 +287,7 @@ export class DHCPService extends Service {
               .join(",")
           }
         ],
-        subnet6: [...subnets]
+        subnet6: subnets
           .filter(s => s.family === "IPv6")
           .map((subnet, index) => {
             return {

package/src/services/ntp.mjs

@@ -68,7 +68,9 @@ export class NTPService extends ExtraSourceService {
           priority: "<10"
         },
         endpoints: e =>
-          e.family === "IPv4" && e.networkInterface.kind !== "loopback",
+          e.service.host !== host &&
+          e.family === "IPv4" &&
+          e.networkInterface.kind !== "loopback",
 
         select: endpoint =>
           `${endpoint.service.isPool ? "pool" : "server"} ${

package/src/subnet.mjs

@@ -53,12 +53,7 @@ export class Subnet extends Base {
   }
 
   matchesAddress(address) {
-    try {
-      return matchPrefixIP(this.address, this.prefixLength, address);
-    } catch (e) {
-      console.error(e, this.toString(), address);
-    }
-    return false;
+    return matchPrefixIP(this.address, this.prefixLength, address);
   }
 
   get isLinkLocal() {

package/types/host.d.mts

@@ -242,7 +242,7 @@ export class Host extends ServiceOwner {
     networkAddresses(filter: any): Generator<any, void, any>;
     get address(): any;
     get addresses(): any[];
-    subnets(): Generator<any, void, any>;
+    get subnets(): Set<any>;
     publicKey(type?: string): Promise<string>;
     preparePackages(dir: any): AsyncGenerator<{
         dir: any;

package/types/service.d.mts

@@ -314,6 +314,7 @@ export class Service extends Base {
     hosts(): Generator<any, void, any>;
     get domainName(): any;
     get networks(): Set<any>;
+    get subnets(): Set<any>;
     endpoints(filter: any): any[];
     address(options?: {
         endpoints: (e: any) => boolean;