pmcf 1.33.0 → 1.35.0

package/bin/pmcf-named-defs

@@ -78,12 +78,11 @@ async function generateNamedDefs(owner, targetDir) {
     zones.push(zone);
 
     for (const subnet of owner.subnets()) {
-      if (subnet.address) {
-        const reverse = reverseAddress(subnet.address);
-        const reverseArpa = reverseArpaAddress(subnet.address);
+      if (subnet.prefix) {
+        const reverseArpa = reverseArpaAddress(subnet.prefix);
         const zone = {
           id: reverseArpa,
-          file: `${reverse}.zone`,
+          file: `${reverseArpa}.zone`,
           records: new Set([SOARecord, NSRecord])
         };
         zones.push(zone);
@@ -98,15 +97,15 @@ async function generateNamedDefs(owner, targetDir) {
       networkInterface
     } of owner.networkAddresses()) {
       const host = networkInterface.host;
-      zone.records.add(
-        createRecord(
-          host.domainName + ".",
-          isIPv4Address(address) ? "A   " : "AAAA",
-          normalizeIPAddress(address)
-        )
-      );
 
       if (!hosts.has(host)) {
+        zone.records.add(
+          createRecord(
+            host.domainName + ".",
+            isIPv4Address(address) ? "A   " : "AAAA",
+            normalizeIPAddress(address)
+          )
+        );
         hosts.add(host);
         for (const service of host.services()) {
           //console.log(service.name);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.33.0",
+  "version": "1.35.0",
   "publishConfig": {
     "access": "public"
   },
@@ -43,7 +43,7 @@
     "pacc": "^3.3.0"
   },
   "devDependencies": {
-    "@types/node": "^22.13.0",
+    "@types/node": "^22.13.1",
     "ava": "^6.2.0",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",

package/src/model.mjs

@@ -342,15 +342,21 @@ export class Host extends Base {
   *networkAddresses() {
     for (const networkInterface of Object.values(this.networkInterfaces)) {
       for (const address of networkInterface.ipAddresses) {
-        yield { address, networkInterface };
+        yield {
+          networkInterface,
+          address,
+          addressWithPrefixLength:
+            networkInterface.addressWithPrefixLength(address)
+        };
       }
     }
   }
 
   get ipAddresses() {
-    return [...this.networkAddresses()].map(na =>
-      normalizeIPAddress(na.address)
-    );
+    return [...this.networkAddresses()].map(na => na.address);
+  }
+  get ipAddressesWithPrefixLength() {
+    return [...this.networkAddresses()].map(na => na.addressWithPrefixLength);
   }
 
   get ipAddress() {
@@ -391,7 +397,7 @@ export class NetworkInterface extends Base {
     return "network_interface";
   }
 
-  #ipAddresses = [];
+  #ipAddresses = new Map();
   #scope;
   #metric;
   #ssid;
@@ -404,21 +410,6 @@ export class NetworkInterface extends Base {
   constructor(owner, data) {
     super(owner, data);
 
-    if (data.ipv4) {
-      this.#ipAddresses.push(...asArray(data.ipv4));
-      delete data.ipv4;
-    }
-
-    if (data.ipv6) {
-      this.#ipAddresses.push(...asArray(data.ipv6));
-      delete data.ipv6;
-    }
-
-    if (data.ipAddresses) {
-      this.#ipAddresses.push(...asArray(data.ipAddresses));
-      delete data.ipAddresses;
-    }
-
     if (data.ssid) {
       this.#ssid = data.ssid;
       delete data.ssid;
@@ -462,26 +453,44 @@ export class NetworkInterface extends Base {
     //this.arpbridge = owner.addARPBridge(this, data.arpbridge);
   }
 
+  set ipAddresses(value) {
+    const networkOwner = this.owner.owner;
+    for (const address of asArray(value)) {
+      const subnet = networkOwner.createSubnet(address);
+      this.#ipAddresses.set(normalizeIPAddress(address), subnet);
+    }
+  }
+
+  subnetForAddress(address) {
+    return (
+      this.network?.subnetForAddress(address) ||
+      this.owner.owner.subnetForAddress(address)
+    );
+  }
+
+  addressWithPrefixLength(address) {
+    return `${address}/${this.subnetForAddress(address)?.prefixLength}`;
+  }
+
   get ipAddresses() {
-    return this.#ipAddresses;
+    return this.#ipAddresses.keys();
   }
 
   get ipAddressesWithPrefixLength() {
-    return this.#ipAddresses.map(a =>
-      isIPv4Address(a) ? `${a}/${this.prefixLength}` : a
+    return [...this.ipAddresses].map(address =>
+      this.addressWithPrefixLength(address)
     );
   }
 
   get ipv4Addresses() {
-    return this.#ipAddresses.filter(a => isIPv4Address(a));
+    return [...this.ipAddresses].filter(a => isIPv4Address(a));
   }
 
   get ipv6Addresses() {
-    return this.#ipAddresses.filter(a => isIPv6Address(a));
+    return [...this.ipAddresses].filter(a => isIPv6Address(a));
   }
 
-  get prefixLength()
-  {
+  get prefixLength() {
     return this.network?.prefixLength;
   }
 
@@ -538,8 +547,8 @@ export class NetworkInterface extends Base {
       "psk",
       "scope",
       "metric",
-      "ipAddresses",
-      "kind"
+      "kind",
+      "ipAddresses"
     ];
   }
 }

package/src/owner.mjs

@@ -1,4 +1,4 @@
-import { asArray } from "./utils.mjs";
+import { asArray, normalizeCIDR } from "./utils.mjs";
 import { Base } from "./base.mjs";
 import { DNSService } from "./dns.mjs";
 
@@ -83,7 +83,7 @@ export class Owner extends Base {
 
   typeNamed(typeName, name) {
     const typeSlot = this.#membersByType.get(typeName);
-    return typeSlot?.get(name);
+    return typeSlot?.get(name) || this.owner?.typeNamed(typeName, name);
   }
 
   *typeList(typeName) {
@@ -160,6 +160,32 @@ export class Owner extends Base {
     return this.typeList("subnet");
   }
 
+  subnetForAddress(address) {
+    for (const subnet of this.subnets()) {
+      if (subnet.matchesAddress(address)) {
+        return subnet;
+      }
+    }
+  }
+
+  createSubnet(address) {
+    if (address instanceof Subnet) {
+      return address;
+    }
+
+    const { cidr } = normalizeCIDR(address);
+
+    if (cidr) {
+      let subnet = this.subnetNamed(cidr);
+
+      if (!subnet) {
+        subnet = new Subnet(this, { name: cidr });
+      }
+
+      return subnet;
+    }
+  }
+
   clusterNamed(name) {
     return this.typeNamed("cluster", name);
   }
@@ -260,9 +286,8 @@ export class Network extends Owner {
   kind;
   scope;
   metric;
-  subnet;
   bridge;
-  #ipAddresses = [];
+  gateway;
 
   static get typeName() {
     return "network";
@@ -271,9 +296,9 @@ export class Network extends Owner {
   constructor(owner, data) {
     super(owner, data);
 
-    if (data.ipAddresses) {
-      this.#ipAddresses.push(...asArray(data.ipAddresses));
-      delete data.ipAddresses;
+    if (data.subnets) {
+      this.addSubnets(data.subnets);
+      delete data.subnets;
     }
 
     let bridge;
@@ -284,20 +309,6 @@ export class Network extends Owner {
 
     Object.assign(this, data);
 
-    const subnetAddress = this.subnetAddress;
-
-    if (subnetAddress) {
-      let subnet = owner.subnetNamed(subnetAddress);
-      if (!subnet) {
-        subnet = new Subnet(owner, { name: subnetAddress });
-      }
-
-      this.subnet = subnet;
-      subnet.networks.add(this);
-    }
-
-    //owner.addObject(this);
-
     this.bridge = owner.addBridge(this, bridge);
   }
 
@@ -308,32 +319,11 @@ export class Network extends Owner {
     return super.networkNamed(name);
   }
 
-  set ipAddresses(value) {
-    this.#ipAddresses = asArray(value);
-  }
-
-  get ipAddresses() {
-    return this.#ipAddresses;
-  }
-
-  get prefixLength() {
-    for (const a of this.#ipAddresses) {
-      const m = a.match(/\/(\d+)$/);
-      if (m) {
-        return parseInt(m[1]);
-      }
-    }
-
-    this.error("no prefixLength", this.#ipAddresses);
-  }
-
-  get subnetAddress() {
-    for (const a of this.#ipAddresses) {
-      const [addr, bits] = a.split(/\//);
-      if (bits) {
-        const parts = addr.split(/\./);
-        return parts.slice(0, bits / 8).join(".");
-      }
+  addSubnets(value) {
+    for (const address of asArray(value)) {
+      const subnet = this.owner.createSubnet(address);
+      this.addObject(subnet);
+      subnet.networks.add(this);
     }
   }
 
@@ -341,12 +331,10 @@ export class Network extends Owner {
     return [
       ...super.propertyNames,
       "kind",
-      "ipAddresses",
-      "subnet",
-      "prefixLength",
       "scope",
       "metric",
-      "bridge"
+      "bridge",
+      "gateway"
     ];
   }
 }
@@ -359,6 +347,16 @@ export class Subnet extends Base {
   }
 
   constructor(owner, data) {
+    const { cidr } = normalizeCIDR(data.name);
+
+    if(!cidr) {
+      const error = Error(`Invalid address`);
+      error.address = data.name;
+      throw error;
+    }
+
+    data.name = cidr;
+
     super(owner, data);
 
     Object.assign(this, data);
@@ -366,12 +364,28 @@ export class Subnet extends Base {
     owner.addObject(this);
   }
 
+  matchesAddress(address) {
+    return address.startsWith(this.prefix);
+  }
+
+  get prefix() {
+    const [prefix] = this.name.split("/");
+    return prefix;
+  }
+
+  get prefixLength() {
+    const m = this.name.match(/\/(\d+)$/);
+    if (m) {
+      return parseInt(m[1]);
+    }
+  }
+
   get address() {
     return this.name;
   }
 
   get propertyNames() {
-    return [...super.propertyNames, "networks"];
+    return [...super.propertyNames, "networks", "prefixLength"];
   }
 
   _traverse(...args) {

package/src/utils.mjs

@@ -52,3 +52,21 @@ export function normalizeIPAddress(address) {
   }
   return parts.map(s => s.padStart(4, "0")).join(":");
 }
+
+export function normalizeCIDR(address) {
+  let [prefix, prefixLength] = address.split(/\//);
+
+  if (prefixLength) {
+    if (isIPv4Address(prefix)) {
+      const parts = prefix.split(/\./);
+      prefix = parts.slice(0, prefixLength / 8).join(".");
+    } else {
+      prefix = normalizeIPAddress(prefix);
+    }
+  }
+  else {
+    return {};
+  }
+
+  return { prefix, prefixLength, cidr: `${prefix}/${prefixLength}` };
+}

package/types/model.d.mts

@@ -38,10 +38,12 @@ export class Host extends Base {
     services(filter: any): Generator<any, void, unknown>;
     addNetworkInterface(networkInterface: any): void;
     networkAddresses(): Generator<{
-        address: any;
         networkInterface: any;
+        address: any;
+        addressWithPrefixLength: any;
     }, void, unknown>;
     get ipAddresses(): any[];
+    get ipAddressesWithPrefixLength(): any[];
     get ipAddress(): any;
     publicKey(type?: string): Promise<string>;
     toJSON(): {
@@ -55,8 +57,11 @@ export class NetworkInterface extends Base {
     hwaddr: any;
     set network(networkOrName: any);
     get network(): any;
-    get ipAddresses(): any[];
-    get ipAddressesWithPrefixLength(): any[];
+    set ipAddresses(value: MapIterator<any>);
+    get ipAddresses(): MapIterator<any>;
+    subnetForAddress(address: any): any;
+    addressWithPrefixLength(address: any): string;
+    get ipAddressesWithPrefixLength(): string[];
     get ipv4Addresses(): any[];
     get ipv6Addresses(): any[];
     get prefixLength(): any;

package/types/owner.d.mts

@@ -21,6 +21,8 @@ export class Owner extends Base {
     networks(): Generator<any, void, unknown>;
     subnetNamed(name: any): any;
     subnets(): Generator<any, void, unknown>;
+    subnetForAddress(address: any): any;
+    createSubnet(address: any): any;
     clusterNamed(name: any): any;
     clusters(): Generator<any, void, unknown>;
     addBridge(network: any, destinationNetworks: any): any;
@@ -34,16 +36,15 @@ export class Network extends Owner {
     kind: any;
     scope: any;
     metric: any;
-    subnet: any;
     bridge: any;
-    set ipAddresses(value: any[]);
-    get ipAddresses(): any[];
-    get prefixLength(): number;
-    get subnetAddress(): any;
-    #private;
+    gateway: any;
+    addSubnets(value: any): void;
 }
 export class Subnet extends Base {
     networks: Set<any>;
+    matchesAddress(address: any): any;
+    get prefix(): any;
+    get prefixLength(): number;
     get address(): any;
     _traverse(...args: any[]): boolean;
 }

package/types/utils.d.mts

@@ -5,3 +5,12 @@ export function asArray(value: any): any[];
 export function isIPv4Address(address: any): boolean;
 export function isIPv6Address(address: any): boolean;
 export function normalizeIPAddress(address: any): any;
+export function normalizeCIDR(address: any): {
+    prefix?: undefined;
+    prefixLength?: undefined;
+    cidr?: undefined;
+} | {
+    prefix: any;
+    prefixLength: any;
+    cidr: string;
+};