pmcf 2.29.0 → 2.29.2

package/bin/pmcf-diagram

@@ -13,14 +13,16 @@ function q(str) {
 console.log("graph G {");
 console.log("  node [shape=record];");
 for await (const host of location.hosts()) {
-  console.log(
-    `  ${q(host.name)} [label="${host.name}|{${[
-      ...host.networkInterfaces.values()
-    ]
-      .filter(ni => !ni.isTemplate && ni.kind !== "loopback")
-      .map(ni => `<${q(ni.name)}> ${ni.name}`)
-      .join("|")}}"];`
-  );
+  if (host.clusters.size === 0) {
+    console.log(
+      `  ${q(host.name)} [label="${host.name}|{${[
+        ...host.networkInterfaces.values()
+      ]
+        .filter(ni => !ni.isTemplate && ni.kind !== "loopback")
+        .map(ni => `<${q(ni.name)}> ${ni.name}`)
+        .join("|")}}"];`
+    );
+  }
 }
 
 for await (const network of location.networks()) {
@@ -47,9 +49,27 @@ for await (const network of location.networks()) {
 for await (const cluster of location.clusters()) {
   console.log(`  subgraph cluster_${cluster.name} {`);
 
-  console.log(`   ${[...cluster.members].map(b => `${q(b.host.name)}:${b.name}`).join(" -- ")};`);
+  for (const ni of cluster.members) {
+    const host = ni.host;
+    console.log(
+      `    ${q(host.name)} [label="${host.name}|{${[
+        ...host.networkInterfaces.values()
+      ]
+        .filter(ni => !ni.isTemplate && ni.kind !== "loopback")
+        .map(ni => `<${q(ni.name)}> ${ni.name}`)
+        .join("|")}}"];`
+    );
+  }
+
+  /*
+  console.log(
+    `   ${[...cluster.members]
+      .map(b => `${q(b.host.name)}:${b.name}`)
+      .join(" -- ")};`
+      
+  );*/
 
-  console.log("  } [label=\"${cluster.name}\"];");
+  console.log(`  } [label="${cluster.name}"];`);
 }
 
 for (const bridge of location.bridges) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "2.29.0",
+  "version": "2.29.2",
   "publishConfig": {
     "access": "public"
   },
@@ -38,13 +38,13 @@
     "lint:typescript": "tsc --allowJs --checkJs --noEmit --resolveJsonModule --target es2024 --lib esnext -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs"
   },
   "dependencies": {
-    "ip-utilties": "^1.2.0",
+    "ip-utilties": "^1.3.0",
     "npm-pkgbuild": "^18.0.1",
     "pacc": "^3.4.0",
     "pkg-dir": "^8.0.0"
   },
   "devDependencies": {
-    "@types/node": "^22.14.0",
+    "@types/node": "^22.14.1",
     "ava": "^6.2.0",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",

package/src/host-utils.mjs

@@ -26,6 +26,8 @@ export async function generateNetworkDefs(host, packageData) {
   const networkDir = join(packageData.dir, "etc/systemd/network");
 
   for (const ni of host.networkInterfaces.values()) {
+    await ni.systemdDefinitions(packageData);
+
     switch (ni.kind) {
       case "loopback":
         continue;
@@ -101,7 +103,7 @@ export async function generateNetworkDefs(host, packageData) {
 
     await writeLines(networkDir, `${ni.name}.network`, networkSections);
 
-    switch (ni?.kind) {
+    switch (ni.kind) {
       case "wifi": {
         const d = join(packageData.dir, "etc/wpa_supplicant");
         await mkdir(d, { recursive: true });

package/src/host.mjs

@@ -324,6 +324,18 @@ export class Host extends Base {
     }
   }
 
+  get clusters() {
+    const clusters = new Set();
+
+    for (const ni of this.networkInterfaces.values()) {
+      if (ni.cluster) {
+        clusters.add(ni.cluster);
+      }
+    }
+
+    return clusters;
+  }
+
   get host() {
     return this;
   }

package/src/network-interface.mjs

@@ -89,6 +89,8 @@ class SkeletonNetworkInterface extends Base {
   get addresses() {
     return [...this.ipAddresses].map(([address]) => address);
   }
+
+  async systemdDefinitions(packageData) {}
 }
 
 export const NetworkInterfaceTypeDefinition = {

package/src/subnet.mjs

@@ -3,7 +3,8 @@ import {
   isLinkLocal,
   rangeIP,
   decodeIP,
-  familyIP
+  familyIP,
+  matchPrefixIP
 } from "ip-utilties";
 import { Base } from "./base.mjs";
 import { addType } from "./types.mjs";
@@ -52,7 +53,13 @@ export class Subnet extends Base {
   }
 
   matchesAddress(address) {
-    return address.startsWith(this.prefix);
+    try {
+      return matchPrefixIP(this.address, this.prefixLength, address);
+    } catch (e) {
+      console.error(e, address, this.address, this.prefixLength);
+    }
+
+    return false;
   }
 
   get isLinkLocal() {

package/types/host.d.mts

@@ -225,6 +225,7 @@ export class Host extends Base {
     get domainNames(): Set<any>;
     get domainName(): any;
     domainNamesIn(domain: any): Generator<any, void, unknown>;
+    get clusters(): Set<any>;
     get host(): this;
     named(name: any): any;
     get networks(): Set<any>;

package/types/network-interface.d.mts

@@ -1350,6 +1350,7 @@ declare class SkeletonNetworkInterface extends Base {
     networkAddress(filter: any): NetworkAddress;
     get address(): any;
     get addresses(): any[];
+    systemdDefinitions(packageData: any): Promise<void>;
 }
 import { Base } from "pmcf";
 import { NetworkAddress } from "pmcf";