pmcf 1.17.0 → 1.17.1

package/bin/pmcf-named-defs

@@ -2,7 +2,7 @@
 
 import { join } from "node:path";
 import { createHmac } from "node:crypto";
-import { writeLines } from "../src/utils.mjs";
+import { writeLines, isIPv4Address } from "../src/utils.mjs";
 import { prepare } from "../src/cmd.mjs";
 
 const { world, args, options } = prepare();
@@ -103,7 +103,7 @@ async function generateNamedDefs(location, targetDir) {
       const host = networkInterface.host;
       zone.records.add(
         `${host.hostName.padEnd(NAME_LEN, " ")} ${ttl} IN ${
-          address.indexOf(".") >= 0 ? "A   " : "AAAA"
+          isIPv4Address(address) ? "A   " : "AAAA"
         }  ${normalizeIPAddress(address)}`
       );
 
@@ -132,7 +132,7 @@ async function generateNamedDefs(location, targetDir) {
 
       const reverseZone = networkInterface.network.subnet?.reverseZone;
 
-      if (reverseZone && address.indexOf(".") >= 0) {
+      if (reverseZone && isIPv4Address(address)) {
         reverseZone.records.add(
           `${(reverseArpaAddress(address) + ".").padEnd(
             NAME_LEN,
@@ -159,7 +159,9 @@ async function generateNamedDefs(location, targetDir) {
       zoneConfig.push(`  file \"${zone.file}\";`);
 
       zoneConfig.push(
-        `  allow-update { ${dns.allowedUpdates.length ? dns.allowedUpdates.join(";") : "none"}; };`
+        `  allow-update { ${
+          dns.allowedUpdates.length ? dns.allowedUpdates.join(";") : "none"
+        }; };`
       );
       zoneConfig.push(`  notify yes;`);
       zoneConfig.push(`};`);
@@ -177,7 +179,7 @@ async function generateNamedDefs(location, targetDir) {
 }
 
 export function reverseAddress(address) {
-  if (address.indexOf(".") >= 0) {
+  if (isIPv4Address(address)) {
     return address.split(".").reverse().join(".");
   }
 
@@ -191,12 +193,12 @@ export function reverseAddress(address) {
 export function reverseArpaAddress(address) {
   return (
     reverseAddress(address) +
-    (address.indexOf(".") >= 0 ? ".in-addr.arpa" : ".ip6.arpa")
+    (isIPv4Address(address) ? ".in-addr.arpa" : ".ip6.arpa")
   );
 }
 
 export function normalizeIPAddress(address) {
-  if (address.indexOf(".") >= 0) {
+  if (isIPv4Address(address)) {
     return address;
   }
   address = address.replace(/\/\d+$/, "");

package/package.json

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

package/src/model.mjs

@@ -668,14 +668,14 @@ export class Host extends Base {
       }
     }
 
-    Object.assign(this, { networkInterfaces: {} }, data);
-
-    owner.addHost(this);
+    Object.assign(this, data);
 
     for (const [name, iface] of Object.entries(this.networkInterfaces)) {
       iface.name = name;
-      this.networkInterfaces[name] = new NetworkInterface(this, iface);
+      new NetworkInterface(this, iface);
     }
+
+    owner.addHost(this);
   }
 
   get deployment() {
@@ -774,10 +774,12 @@ export class Host extends Base {
     }
   }
 
+  addNetworkInterface(networkInterface) {
+    this.networkInterfaces[networkInterface.name] = networkInterface;
+  }
+
   *networkAddresses() {
-    for (const [name, networkInterface] of Object.entries(
-      this.networkInterfaces
-    )) {
+    for (const networkInterface of Object.values(this.networkInterfaces)) {
       for (const attribute of ["ipv4", "ipv6", "link-local-ipv6"]) {
         if (networkInterface[attribute]) {
           yield { address: networkInterface[attribute], networkInterface };
@@ -846,6 +848,8 @@ export class NetworkInterface extends Base {
     }
 
     Object.assign(this, data);
+
+    owner.addNetworkInterface(this);
   }
 
   get host() {

package/src/utils.mjs

@@ -31,3 +31,11 @@ export function bridgeToJSON(bridge) {
 export function asArray(value) {
   return Array.isArray(value) ? value : value === undefined ? [] : [value];
 }
+
+export function isIPv4Address(address) {
+  return address.indexOf(".") >= 0;
+}
+
+export function isIPv6Address(address) {
+  return address.indexOf(":") >= 0;
+}

package/types/model.d.mts

@@ -109,6 +109,7 @@ export class Host extends Base {
     get domainName(): string;
     addService(service: any): void;
     services(filter: any): Generator<any, void, unknown>;
+    addNetworkInterface(networkInterface: any): void;
     networkAddresses(): Generator<{
         address: any;
         networkInterface: any;

package/types/utils.d.mts

@@ -2,3 +2,5 @@ export function writeLines(dir: any, name: any, lines: any): Promise<void>;
 export function sectionLines(sectionName: any, values: any): string[];
 export function bridgeToJSON(bridge: any): any[];
 export function asArray(value: any): any[];
+export function isIPv4Address(address: any): boolean;
+export function isIPv6Address(address: any): boolean;