pmcf 2.20.1 → 2.21.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "2.20.1",
+  "version": "2.21.1",
   "publishConfig": {
     "access": "public"
   },
@@ -38,7 +38,7 @@
     "lint:typescript": "tsc --allowJs --checkJs --noEmit --resolveJsonModule --target es2024 --lib esnext -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs"
   },
   "dependencies": {
-    "ip-utilties": "^1.1.1",
+    "ip-utilties": "^1.2.0",
     "npm-pkgbuild": "^18.0.1",
     "pacc": "^3.4.0",
     "pkg-dir": "^8.0.0"

package/src/host-utils.mjs

@@ -2,6 +2,7 @@ import { writeFile, mkdir } from "node:fs/promises";
 import { join } from "node:path";
 import { writeLines, sectionLines } from "../src/utils.mjs";
 import { addHook } from "./hooks.mjs";
+import { cidrAddresses } from "./network-support.mjs";
 
 export async function generateMachineInfo(host, packageData) {
   const etcDir = join(packageData.dir, "etc");
@@ -40,7 +41,7 @@ export async function generateNetworkDefs(host, packageData) {
 
     const networkSections = [sectionLines("Match", { Name: ni.name })];
 
-    for (const Address of ni.cidrAddresses) {
+    for (const Address of cidrAddresses(ni.networkAddresses())) {
       networkSections.push(
         "",
         sectionLines("Address", {

package/src/host.mjs

@@ -435,16 +435,6 @@ export class Host extends Base {
     return [...this.networkAddresses()].map(na => na.address);
   }
 
-  get cidrAddress() {
-    return this.cidrAddresses[0];
-  }
-
-  get cidrAddresses() {
-    return [...this.networkAddresses()].map(({ address, subnet }) =>
-      formatCIDR(address, subnet.prefixLength)
-    );
-  }
-
   async publicKey(type = "ed25519") {
     return readFile(join(this.directory, `ssh_host_${type}_key.pub`), "utf8");
   }

package/src/module.mjs

@@ -10,6 +10,7 @@ export * from "./root.mjs";
 export * from "./address.mjs";
 export * from "./subnet.mjs";
 export * from "./network.mjs";
+export * from "./network-support.mjs";
 export * from "./network-interface.mjs";
 export * from "./host.mjs";
 export * from "./types.mjs";

package/src/network-interface.mjs

@@ -3,7 +3,8 @@ import {
   isIPv6,
   formatCIDR,
   hasWellKnownSubnet,
-  normalizeIP
+  normalizeIP,
+  familyIP
 } from "ip-utilties";
 import { Base } from "./base.mjs";
 import { Subnet } from "./subnet.mjs";
@@ -18,6 +19,7 @@ import { addType } from "./types.mjs";
  * @typedef {object} NetworkAddress
  * @property {NetworkInterface} networkInterface
  * @property {string|Uint8Array|Uint16Array} address
+ * @property {string} family
  * @property {Subnet} subnet
  * @property {Set<string>} domainNames
  */
@@ -72,62 +74,39 @@ class SkeletonNetworkInterface extends Base {
   }
 
   /**
-   * 
+   *
    * @param {object} filter
-   * @return {Iterable<NetworkAddress>} 
+   * @return {Iterable<NetworkAddress>}
    */
-  *networkAddresses(filter=(n)=>true) {
+  *networkAddresses(filter = n => true) {
     for (const [address, subnet] of this.ipAddresses) {
       const networkAddress = {
         networkInterface: this,
         domainNames: this.domainNames,
         address,
+        family: familyIP(address),
         subnet
       };
 
-      if(filter(networkAddress)) {
+      if (filter(networkAddress)) {
         yield networkAddress;
       }
     }
   }
 
-  get rawAddress() {
-    return this.rawAddresses[0];
-  }
-
-  get rawIPv4Address() {
-    return this.rawAddresses.filter(a => isIPv4(a))[0];
-  }
-
-  get rawIPv6Address() {
-    return this.rawAddresses.filter(a => isIPv6(a))[0];
+  networkAddress(filter) {
+    for (const a of this.networkAddresses(filter)) {
+      return a;
+    }
   }
 
-  get cidrAddress() {
-    return this.cidrAddresses[0];
+  get rawAddress() {
+    return this.rawAddresses[0];
   }
 
   get rawAddresses() {
     return [...this.ipAddresses].map(([address]) => address);
   }
-
-  get rawIPv4Addresses() {
-    return [...this.ipAddresses]
-      .filter(([address]) => isIPv4(address))
-      .map(([address]) => address);
-  }
-
-  get rawIPv6Addresses() {
-    return [...this.ipAddresses]
-      .filter(([address]) => isIPv6(address))
-      .map(([address]) => address);
-  }
-
-  get cidrAddresses() {
-    return [...this.ipAddresses].map(([address, subnet]) =>
-      formatCIDR(address, subnet.prefixLength)
-    );
-  }
 }
 
 export const NetworkInterfaceTypeDefinition = {

package/src/network-support.mjs

@@ -1,3 +1,5 @@
+import { formatCIDR } from "ip-utilties";
+
 export const networkProperties = {
   scope: {
     type: "string",
@@ -23,7 +25,12 @@ export const networkProperties = {
   metric: { type: "number", collection: false, writeable: true, default: 1004 },
   MTU: { type: "number", collection: false, writeable: true, default: 1500 },
   gateway: { type: "host", collection: false, writeable: true },
-  multicastDNS: { type: "boolean", collection: false, writeable: true, default: false }
+  multicastDNS: {
+    type: "boolean",
+    collection: false,
+    writeable: true,
+    default: false
+  }
 };
 
 export const networkAddressProperties = {
@@ -33,3 +40,9 @@ export const networkAddressProperties = {
   rawAddresses: { type: "string", collection: true, writeable: false },
   rawAddress: { type: "string", collection: false, writeable: false }
 };
+
+export function cidrAddresses(networkAddresses) {
+  return [...networkAddresses].map(na =>
+    formatCIDR(na.address, na.subnet.prefixLength)
+  );
+}

package/src/services/dhcp.mjs

@@ -209,7 +209,7 @@ export class DHCPService extends Service {
       .map(([k, networkInterface]) => {
         return {
           "hw-address": k,
-          "ip-address": networkInterface.rawIPv4Address,
+          "ip-address": networkInterface.networkAddress(n => n.family === "IPv4").address,
           hostname: networkInterface.hostName
         };
       })

package/types/host.d.mts

@@ -235,8 +235,6 @@ export class Host extends Base {
     networkAddresses(filter: any): Generator<any, void, any>;
     get rawAddress(): any;
     get rawAddresses(): any[];
-    get cidrAddress(): any;
-    get cidrAddresses(): any[];
     publicKey(type?: string): Promise<string>;
     preparePackages(dir: any): AsyncGenerator<{
         dir: any;

package/types/module.d.mts

@@ -10,6 +10,7 @@ export * from "./root.mjs";
 export * from "./address.mjs";
 export * from "./subnet.mjs";
 export * from "./network.mjs";
+export * from "./network-support.mjs";
 export * from "./network-interface.mjs";
 export * from "./host.mjs";
 export * from "./types.mjs";

package/types/network-interface.d.mts

@@ -688,6 +688,7 @@ export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
 export type NetworkAddress = {
     networkInterface: NetworkInterface;
     address: string | Uint8Array | Uint16Array;
+    family: string;
     subnet: Subnet;
     domainNames: Set<string>;
 };
@@ -695,6 +696,7 @@ export type NetworkAddress = {
  * @typedef {object} NetworkAddress
  * @property {NetworkInterface} networkInterface
  * @property {string|Uint8Array|Uint16Array} address
+ * @property {string} family
  * @property {Subnet} subnet
  * @property {Set<string>} domainNames
  */
@@ -715,14 +717,9 @@ declare class SkeletonNetworkInterface extends Base {
      * @return {Iterable<NetworkAddress>}
      */
     networkAddresses(filter?: object): Iterable<NetworkAddress>;
+    networkAddress(filter: any): NetworkAddress;
     get rawAddress(): any;
-    get rawIPv4Address(): any;
-    get rawIPv6Address(): any;
-    get cidrAddress(): any;
     get rawAddresses(): any[];
-    get rawIPv4Addresses(): any[];
-    get rawIPv6Addresses(): any[];
-    get cidrAddresses(): any[];
 }
 import { Subnet } from "./subnet.mjs";
 import { Base } from "./base.mjs";

package/types/network-support.d.mts

@@ -1,3 +1,4 @@
+export function cidrAddresses(networkAddresses: any): any[];
 export namespace networkProperties {
     export namespace scope {
         export let type: string;