pmcf 2.19.4 → 2.19.6

package/package.json

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

package/src/host.mjs

@@ -13,7 +13,7 @@ import {
   generateMachineInfo,
   generateKnownHosts
 } from "./host-utils.mjs";
-import {NetworkInterfaceTypeDefinition} from "./network-interface.mjs";
+import { NetworkInterfaceTypeDefinition } from "./network-interface.mjs";
 
 const HostTypeDefinition = {
   name: "host",
@@ -421,16 +421,9 @@ export class Host extends Base {
     }
   }
 
-  *networkAddresses() {
+  *networkAddresses(filter) {
     for (const networkInterface of this.networkInterfaces.values()) {
-      for (const [address, subnet] of networkInterface.ipAddresses) {
-        yield {
-          networkInterface,
-          domainNames: networkInterface.domainNames,
-          address,
-          subnet
-        };
-      }
+      yield* networkInterface.networkAddresses(filter);
     }
   }
 
@@ -448,7 +441,7 @@ export class Host extends Base {
 
   get cidrAddresses() {
     return [...this.networkAddresses()].map(({ address, subnet }) =>
-      formatCIDR(address, subnet)
+      formatCIDR(address, subnet.prefixLength)
     );
   }
 

package/src/network-interface.mjs

@@ -6,6 +6,7 @@ import {
   normalizeIP
 } from "ip-utilties";
 import { Base } from "./base.mjs";
+import { Subnet } from "./subnet.mjs";
 import {
   networkProperties,
   networkAddressProperties
@@ -13,6 +14,14 @@ import {
 import { asArray } from "./utils.mjs";
 import { addType } from "./types.mjs";
 
+/**
+ * @typedef {object} NetworkAddress
+ * @property {NetworkInterface} networkInterface
+ * @property {string|Uint8Array|Uint16Array} address
+ * @property {Subnet} subnet
+ * @property {Set<string>} domainNames
+ */
+
 class SkeletonNetworkInterface extends Base {
   _extends = [];
   _network;
@@ -43,7 +52,7 @@ class SkeletonNetworkInterface extends Base {
 
   matches(other) {
     if (this.isTemplate) {
-      const name = this.name.replace("*", "");
+      const name = this.name.replaceAll("*", "");
       return name.length === 0 || other.name.indexOf(name) >= 0;
     }
 
@@ -58,6 +67,26 @@ class SkeletonNetworkInterface extends Base {
     this._network = network;
   }
 
+  get ipAddresses() {
+    return new Map();
+  }
+
+  /**
+   * 
+   * @param {object} filter
+   * @return {Iterable<NetworkAddress>} 
+   */
+  *networkAddresses(filter) {
+    for (const [address, subnet] of this.ipAddresses) {
+      yield {
+        networkInterface: this,
+        domainNames: this.domainNames,
+        address,
+        subnet
+      };
+    }
+  }
+
   get rawAddress() {
     return this.rawAddresses[0];
   }
@@ -74,10 +103,6 @@ class SkeletonNetworkInterface extends Base {
     return this.cidrAddresses[0];
   }
 
-  get ipAddresses() {
-    return new Map();
-  }
-
   get rawAddresses() {
     return [...this.ipAddresses].map(([address]) => address);
   }
@@ -96,7 +121,7 @@ class SkeletonNetworkInterface extends Base {
 
   get cidrAddresses() {
     return [...this.ipAddresses].map(([address, subnet]) =>
-      formatCIDR(address, subnet)
+      formatCIDR(address, subnet.prefixLength)
     );
   }
 }
@@ -292,8 +317,8 @@ const LoopbackNetworkInterfaceTypeDefinition = {
 };
 
 const _localAddresses = new Map([
-  ["127.0.0.1", { prefix: "127.0.0", prefixLength: 8 }], // TODO
-  ["::1", { prefix: "", prefixLength: 128 }]
+  ["127.0.0.1", { address: "127.0.0/8", prefix: "127.0.0", prefixLength: 8 }], // TODO
+  ["::1", { address: "::1/128", prefix: "::1", prefixLength: 128 }]
 ]);
 
 export class LoopbackNetworkInterface extends SkeletonNetworkInterface {

package/src/owner.mjs

@@ -298,9 +298,9 @@ export class Owner extends Base {
     return all;
   }
 
-  *networkAddresses() {
+  *networkAddresses(filter) {
     for (const host of this.hosts()) {
-      yield* host.networkAddresses();
+      yield* host.networkAddresses(filter);
     }
   }
 

package/types/host.d.mts

@@ -232,12 +232,7 @@ export class Host extends Base {
     findNetworkInterface(filter: any): any;
     set networkInterfaces(networkInterface: Map<any, any>);
     get networkInterfaces(): Map<any, any>;
-    networkAddresses(): Generator<{
-        networkInterface: any;
-        domainNames: any;
-        address: any;
-        subnet: any;
-    }, void, unknown>;
+    networkAddresses(filter: any): Generator<any, void, any>;
     get rawAddress(): any;
     get rawAddresses(): any[];
     get cidrAddress(): any;

package/types/network-interface.d.mts

@@ -680,10 +680,24 @@ export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
     get scope(): string;
     get hostName(): string;
     get ipAddresses(): Map<string, {
+        address: string;
         prefix: string;
         prefixLength: number;
     }>;
 }
+export type NetworkAddress = {
+    networkInterface: NetworkInterface;
+    address: string | Uint8Array | Uint16Array;
+    subnet: Subnet;
+    domainNames: Set<string>;
+};
+/**
+ * @typedef {object} NetworkAddress
+ * @property {NetworkInterface} networkInterface
+ * @property {string|Uint8Array|Uint16Array} address
+ * @property {Subnet} subnet
+ * @property {Set<string>} domainNames
+ */
 declare class SkeletonNetworkInterface extends Base {
     _extends: any[];
     _network: any;
@@ -694,15 +708,22 @@ declare class SkeletonNetworkInterface extends Base {
     matches(other: any): boolean;
     set network(network: any);
     get network(): any;
+    get ipAddresses(): Map<any, any>;
+    /**
+     *
+     * @param {object} filter
+     * @return {Iterable<NetworkAddress>}
+     */
+    networkAddresses(filter: object): Iterable<NetworkAddress>;
     get rawAddress(): any;
     get rawIPv4Address(): any;
     get rawIPv6Address(): any;
     get cidrAddress(): any;
-    get ipAddresses(): Map<any, any>;
     get rawAddresses(): any[];
     get rawIPv4Addresses(): any[];
     get rawIPv6Addresses(): any[];
     get cidrAddresses(): any[];
 }
+import { Subnet } from "./subnet.mjs";
 import { Base } from "./base.mjs";
 export {};

package/types/owner.d.mts

@@ -155,7 +155,7 @@ export class Owner extends Base {
     addBridge(network: any, destinationNetworks: any): any;
     _resolveBridges(): void;
     get derivedPackaging(): Set<any>;
-    networkAddresses(): Generator<any, void, any>;
+    networkAddresses(filter: any): Generator<any, void, any>;
     _country: any;
     set country(value: any);
     get country(): any;