pmcf 1.44.1 → 1.45.1

package/bin/pmcf-host-defs

@@ -55,7 +55,7 @@ async function generateNetworkDefs(host, dir) {
 
     const networkSections = [sectionLines("Match", { Name: ni.name })];
 
-    for (const Address of ni.ipAddressesWithPrefixLength) {
+    for (const Address of ni.cidrAddresses) {
       networkSections.push(
         "",
         sectionLines("Address", {

package/bin/pmcf-named-defs

@@ -69,6 +69,7 @@ async function generateNamedDefs(owner, targetDir) {
       rname,
       subnets.map(s => `${s.owner.name}/${s.name}`)
     );
+    const reverseZones = new Map();
 
     const SOARecord = createRecord(
       "@",
@@ -78,7 +79,7 @@ async function generateNamedDefs(owner, targetDir) {
       `(${updates})`
     );
 
-    const NSRecord = createRecord("@", "NS", fullName(nameserver?.ipAddress));
+    const NSRecord = createRecord("@", "NS", fullName(nameserver?.rawAddress));
 
     const catalogZone = {
       id: `catalog.${domain}`,
@@ -97,23 +98,11 @@ async function generateNamedDefs(owner, targetDir) {
     };
     zones.push(zone);
 
-    for (const subnet of subnets) {
-      if (!subnet.isLinkLocal && subnet.prefix) {
-        const reverseArpa = reverseArpaAddress(subnet.prefix);
-        const reverseZone = {
-          id: reverseArpa,
-          file: `${reverseArpa}.zone`,
-          records: new Set([SOARecord, NSRecord])
-        };
-        zones.push(reverseZone);
-        subnet.reverseZone = reverseZone;
-      }
-    }
-
     const hosts = new Set();
 
     for await (const {
       address,
+      subnet,
       networkInterface
     } of owner.networkAddresses()) {
       const host = networkInterface.host;
@@ -147,18 +136,28 @@ async function generateNamedDefs(owner, targetDir) {
             );
           }
         }
-      }
-
-      const reverseZone = networkInterface.network.subnet?.reverseZone;
 
-      if (reverseZone) {
-        reverseZone.records.add(
-          createRecord(
-            fullName(reverseArpaAddress(address)),
-            "PTR",
-            fullName(networkInterface.host.domainName)
-          )
-        );
+        if (subnet) {
+          let reverseZone = reverseZones.get(subnet.address);
+
+          if (!reverseZone) {
+            const reverseArpa = reverseArpaAddress(subnet.prefix);
+            reverseZone = {
+              id: reverseArpa,
+              file: `${reverseArpa}.zone`,
+              records: new Set([SOARecord, NSRecord])
+            };
+            zones.push(reverseZone);
+            reverseZones.set(subnet.address, reverseZone);
+          }
+          reverseZone.records.add(
+            createRecord(
+              fullName(reverseArpaAddress(address)),
+              "PTR",
+              fullName(host.domainName)
+            )
+          );
+        }
       }
     }
 

package/package.json

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

package/src/host.mjs

@@ -4,7 +4,8 @@ import {
   asArray,
   isIPv4Address,
   isIPv6Address,
-  normalizeIPAddress
+  normalizeIPAddress,
+  formatCIDR
 } from "./utils.mjs";
 import { addType } from "./types.mjs";
 
@@ -246,27 +247,28 @@ export class Host extends Base {
 
   *networkAddresses() {
     for (const networkInterface of this.networkInterfaces.values()) {
-      for (const address of networkInterface.ipAddresses) {
+      for (const [address, subnet] of networkInterface.ipAddresses) {
         yield {
           networkInterface,
           address,
-          addressWithPrefixLength:
-            networkInterface.addressWithPrefixLength(address)
+          subnet
         };
       }
     }
   }
 
-  get ipAddresses() {
-    return [...this.networkAddresses()].map(na => na.address);
+  get rawAddress() {
+    return this.rawAddresses[0];
   }
 
-  get ipAddressesWithPrefixLength() {
-    return [...this.networkAddresses()].map(na => na.addressWithPrefixLength);
+  get rawAddresses() {
+    return [...this.networkAddresses()].map(na => na.address);
   }
 
-  get ipAddress() {
-    return this.ipAddresses[0];
+  get cidrAddresses() {
+    return [...this.networkAddresses()].map(({ address, subnet }) =>
+      formatCIDR(address, subnet)
+    );
   }
 
   async publicKey(type = "ed25519") {
@@ -303,7 +305,8 @@ export class NetworkInterface extends Base {
         ssid: { type: "string" },
         psk: { type: "string" },
         metric: { type: "number" },
-        ipAddresses: { type: "string", collection: true },
+        cidrAddresses: { type: "string", collection: true },
+        rawAddress: { type: "string"},
         network: {},
         gateway: {},
         arpbridge: {}
@@ -375,6 +378,10 @@ export class NetworkInterface extends Base {
     }
   }
 
+  get ipAddresses() {
+    return this.#ipAddresses;
+  }
+
   set ipAddresses(value) {
     for (const address of asArray(value)) {
       this.#ipAddresses.set(
@@ -384,6 +391,28 @@ export class NetworkInterface extends Base {
     }
   }
 
+  get rawAddresses() {
+    return [...this.#ipAddresses].map(([address, subnet]) => address);
+  }
+
+  get cidrAddresses() {
+    return [...this.#ipAddresses].map(([address, subnet]) =>
+      formatCIDR(address, subnet)
+    );
+  }
+
+  get rawIPv4Addresses() {
+    return [...this.ipAddresses]
+      .filter(([address, subnet]) => isIPv4Address(address))
+      .map(([address, subnet]) => address);
+  }
+
+  get rawIPv6Addresses() {
+    return [...this.ipAddresses]
+      .filter(([address, subnet]) => isIPv6Address(address))
+      .map(([address, subnet]) => address);
+  }
+
   subnetForAddress(address) {
     return (
       this.network?.subnetForAddress(address) ||
@@ -391,10 +420,6 @@ export class NetworkInterface extends Base {
     );
   }
 
-  addressWithPrefixLength(address) {
-    return `${address}/${this.subnetForAddress(address)?.prefixLength}`;
-  }
-
   get gateway() {
     return this.network?.gateway;
   }
@@ -407,24 +432,6 @@ export class NetworkInterface extends Base {
     }
   }
 
-  get ipAddresses() {
-    return [...this.#ipAddresses.keys()];
-  }
-
-  get ipAddressesWithPrefixLength() {
-    return [...this.#ipAddresses].map(
-      ([address, subnet]) => `${address}/${subnet?.prefixLength}`
-    );
-  }
-
-  get ipv4Addresses() {
-    return [...this.ipAddresses].filter(a => isIPv4Address(a));
-  }
-
-  get ipv6Addresses() {
-    return [...this.ipAddresses].filter(a => isIPv6Address(a));
-  }
-
   get host() {
     return this.owner;
   }

package/src/location.mjs

@@ -15,7 +15,8 @@ export class Location extends Owner {
         hosts: { type: "host", collection: true },
         clusters: { type: "cluster", collection: true },
         subnets: { type: "subnet", collection: true },
-        dns: { type: "dns", collection: false }
+        dns: { type: "dns", collection: false },
+        country: { type: "string" }
       }
     };
   }

package/src/owner.mjs

@@ -169,9 +169,15 @@ export class Owner extends Base {
     }
 
     const subnets = [...this.subnets()];
+
+    const subnet = subnets.find(s =>s.matchesAddress(address));
+    if(subnet) {
+      return subnet;
+    }
+    /*
     if (subnets.length === 1) {
       return subnets[0];
-    }
+    }*/
 
     this.error(
       `Address without subnet ${address}`,

package/src/service.mjs

@@ -109,7 +109,7 @@ export class Service extends Base {
   }
 
   get ipAddresses() {
-    return this.#ipAddresses || this.owner.ipAddresses;
+    return this.#ipAddresses || this.owner.rawAddresses;
   }
 
   get addresses() {

package/src/utils.mjs

@@ -130,6 +130,11 @@ export function encodeIP(address) {
   return _encode(isIPv4Address(address) ? ipv4 : ipv6, address);
 }
 
+export function formatCIDR(address,subnet)
+{
+  return subnet ? `${address}/${subnet.prefixLength}`: address;
+}
+
 export function normalizeCIDR(address) {
   let [prefix, prefixLength] = address.split(/\//);
 

package/types/host.d.mts

@@ -63,11 +63,11 @@ export class Host extends Base {
     networkAddresses(): Generator<{
         networkInterface: any;
         address: any;
-        addressWithPrefixLength: any;
+        subnet: any;
     }, void, unknown>;
-    get ipAddresses(): any[];
-    get ipAddressesWithPrefixLength(): any[];
-    get ipAddress(): any;
+    get rawAddress(): any;
+    get rawAddresses(): any[];
+    get cidrAddresses(): any[];
     publicKey(type?: string): Promise<any>;
     #private;
 }
@@ -94,10 +94,13 @@ export class NetworkInterface extends Base {
             metric: {
                 type: string;
             };
-            ipAddresses: {
+            cidrAddresses: {
                 type: string;
                 collection: boolean;
             };
+            rawAddress: {
+                type: string;
+            };
             network: {};
             gateway: {};
             arpbridge: {};
@@ -108,15 +111,15 @@ export class NetworkInterface extends Base {
     set network(networkOrName: any);
     get network(): any;
     addSubnet(address: any): any;
-    set ipAddresses(value: any[]);
-    get ipAddresses(): any[];
+    set ipAddresses(value: Map<any, any>);
+    get ipAddresses(): Map<any, any>;
+    get rawAddresses(): any[];
+    get cidrAddresses(): any[];
+    get rawIPv4Addresses(): any[];
+    get rawIPv6Addresses(): any[];
     subnetForAddress(address: any): any;
-    addressWithPrefixLength(address: any): string;
     get gateway(): any;
     get gatewayAddress(): any;
-    get ipAddressesWithPrefixLength(): string[];
-    get ipv4Addresses(): any[];
-    get ipv6Addresses(): any[];
     get scope(): any;
     get metric(): any;
     get ssid(): any;

package/types/location.d.mts

@@ -23,6 +23,9 @@ export class Location extends Owner {
                 type: string;
                 collection: boolean;
             };
+            country: {
+                type: string;
+            };
         };
     };
     get location(): this;

package/types/utils.d.mts

@@ -13,6 +13,7 @@ export function decodeIPv4(address: any, length: any): string;
 export function encodeIPv4(address: any): bigint;
 export function decodeIP(address: any, length: any): string;
 export function encodeIP(address: any): bigint;
+export function formatCIDR(address: any, subnet: any): any;
 export function normalizeCIDR(address: any): {
     prefix?: undefined;
     prefixLength?: undefined;