pmcf 2.21.0 → 2.21.2

package/package.json

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

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

@@ -104,19 +104,9 @@ class SkeletonNetworkInterface extends Base {
     return this.rawAddresses[0];
   }
 
-  get cidrAddress() {
-    return this.cidrAddresses[0];
-  }
-
   get rawAddresses() {
     return [...this.ipAddresses].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/service.mjs

@@ -173,10 +173,6 @@ export class Service extends Base {
     this._ipAddresses = value;
   }
 
-  get addresses() {
-    return this.rawAddresses.map(a => `${a}:${this.port}`);
-  }
-
   get networks() {
     return this.server.networks;
   }
@@ -328,12 +324,22 @@ export class Endpoint {
     return `${this.rawAddress}[${this.port}]`;
   }
 
+  get socketAddress()
+  {
+    return `${this.address}:${this.port}`;
+  }
+
   get hostName() {
     return this.networkInterface.hostName;
   }
 
   #rawAddress;
 
+  get address()
+  {
+    return this.#rawAddress ?? this.networkInterface.rawAddress;
+  }
+  
   get rawAddress() {
     return this.#rawAddress ?? this.networkInterface.rawAddress;
   }

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

@@ -719,9 +719,7 @@ declare class SkeletonNetworkInterface extends Base {
     networkAddresses(filter?: object): Iterable<NetworkAddress>;
     networkAddress(filter: any): NetworkAddress;
     get rawAddress(): any;
-    get cidrAddress(): any;
     get rawAddresses(): 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;

package/types/service.d.mts

@@ -311,7 +311,6 @@ export class Service extends Base {
     get rawAddresses(): any;
     get rawAddress(): any;
     set ipAddresses(value: any);
-    get addresses(): any;
     get networks(): any;
     get endpoints(): any[];
     findEndpoints(filter: any): Generator<any, void, any>;
@@ -336,7 +335,9 @@ export class Endpoint {
     service: any;
     networkInterface: any;
     toString(): string;
+    get socketAddress(): string;
     get hostName(): any;
+    get address(): any;
     set rawAddress(value: any);
     get rawAddress(): any;
     #private;