pmcf 1.24.1 → 1.25.1

package/bin/pmcf-named-defs

@@ -2,7 +2,11 @@
 
 import { join } from "node:path";
 import { createHmac } from "node:crypto";
-import { writeLines, isIPv4Address } from "../src/utils.mjs";
+import {
+  writeLines,
+  isIPv4Address,
+  normalizeIPAddress
+} from "../src/utils.mjs";
 import { prepare } from "../src/cmd.mjs";
 
 const { world, args, options } = prepare();
@@ -41,7 +45,10 @@ async function generateNamedDefs(owner, targetDir) {
         type,
         value,
         toString: () =>
-          `${key.padEnd(maxKeyLength, " ")} ${ttl} IN ${type.padEnd(5, " ")} ${value}`
+          `${key.padEnd(maxKeyLength, " ")} ${ttl} IN ${type.padEnd(
+            5,
+            " "
+          )} ${value}`
       };
     };
 
@@ -201,16 +208,3 @@ export function reverseArpaAddress(address) {
     (isIPv4Address(address) ? ".in-addr.arpa" : ".ip6.arpa")
   );
 }
-
-export function normalizeIPAddress(address) {
-  if (isIPv4Address(address)) {
-    return address;
-  }
-  address = address.replace(/\/\d+$/, "");
-  const parts = address.split(":");
-  const i = parts.indexOf("");
-  if (i >= 0) {
-    parts.splice(i, 1, ..."0".repeat(9 - parts.length));
-  }
-  return parts.map(s => s.padStart(4, "0")).join(":");
-}

package/package.json

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

package/src/base.mjs

@@ -122,8 +122,14 @@ export class Base {
   }
 
   execFinalize() {
+    this.traverse(object => {
+      //console.log(object.toString());
+      object._finalize();
+    });
+  }
+
+  _finalize() {
     if (this.#finalize) {
-      //this.info("finalize");
       let i = 0;
       for (const action of this.#finalize) {
         if (action) {
@@ -135,6 +141,23 @@ export class Base {
     }
   }
 
+  traverse(visitor, ...args) {
+    const visited = new Set();
+    this._traverse(visited, visitor, ...args);
+  }
+
+  _traverse(visited, visitor, ...args) {
+    if (visited.has(this)) {
+      return false;
+    }
+
+    visited.add(this);
+
+    visitor(this, ...args);
+
+    return true;
+  }
+
   error(...args) {
     console.error(`${this.toString()}:`, ...args);
   }

package/src/model.mjs

@@ -4,7 +4,8 @@ import {
   asArray,
   bridgeToJSON,
   isIPv4Address,
-  isIPv6Address
+  isIPv6Address,
+  normalizeIPAddress
 } from "./utils.mjs";
 import { Base } from "./base.mjs";
 import { Service } from "./service.mjs";
@@ -41,18 +42,22 @@ export class Owner extends Base {
       }
     }
     Object.assign(this, data);
+  }
 
-    this.finalize(() => {
+  _traverse(...args) {
+    if (super._traverse(...args)) {
       for (const network of this.#networks.values()) {
-        network.execFinalize();
+        network._traverse(...args);
       }
-    });
 
-    this.finalize(() => {
       for (const host of this.#hosts.values()) {
-        host.execFinalize();
+        host._traverse(...args);
       }
-    });
+
+      return true;
+    }
+
+    return false;
   }
 
   get dns() {
@@ -219,6 +224,18 @@ export class World extends Owner {
     this.addObject(this);
   }
 
+  _traverse(...args) {
+    if (super._traverse(...args)) {
+      for (const object of this.#byName.values()) {
+        object._traverse(...args);
+      }
+
+      return true;
+    }
+
+    return false;
+  }
+
   get fullName() {
     return "";
   }
@@ -429,7 +446,6 @@ export class Host extends Base {
   #deployment;
   #chassis;
   #vendor;
-  #location;
 
   static get typeName() {
     return "host";
@@ -452,11 +468,6 @@ export class Host extends Base {
   constructor(owner, data) {
     super(owner, data);
 
-    if (data.location !== undefined) {
-      this.#location = data.location;
-      delete data.location;
-    }
-
     if (data.deployment !== undefined) {
       this.#deployment = data.deployment;
       delete data.deployment;
@@ -520,12 +531,20 @@ export class Host extends Base {
     }
 
     owner.addHost(this);
+  }
 
-    this.finalize(() => {
+  _traverse(...args) {
+    if (super._traverse(...args)) {
       for (const ni of Object.values(this.networkInterfaces)) {
-        ni.execFinalize();
+        ni._traverse(...args);
+      }
+      for (const service of this.services()) {
+        service._traverse(...args);
       }
-    });
+
+      return true;
+    }
+    return false;
   }
 
   get deployment() {
@@ -552,10 +571,6 @@ export class Host extends Base {
     return this.#extends.map(e => this.expand(e));
   }
 
-  get location() {
-    return this.#location || super.location;
-  }
-
   get provides() {
     let provides = new Set(this.#provides);
     this.extends.forEach(h => (provides = provides.union(h.provides)));
@@ -645,13 +660,11 @@ export class Host extends Base {
   }
 
   get ipAddresses() {
-    return [...this.networkAddresses()].map(na => na.address);
+    return [...this.networkAddresses()].map(na => normalizeIPAddress(na.address));
   }
 
   get ipAddress() {
-    for (const a of this.networkAddresses()) {
-      return a.address;
-    }
+    return this.ipAddresses[0];
   }
 
   async publicKey(type = "ed25519") {
@@ -857,6 +870,5 @@ export class Subnet extends Base {
   }
 }
 
-
 const _types = [Location, Network, Subnet, Host, Service, DNSService];
 const _typesByName = Object.fromEntries(_types.map(t => [t.typeName, t]));

package/src/utils.mjs

@@ -39,3 +39,16 @@ export function isIPv4Address(address) {
 export function isIPv6Address(address) {
   return address.indexOf(":") >= 0;
 }
+
+export function normalizeIPAddress(address) {
+  address = address.replace(/\/\d+$/, "");
+  if (isIPv4Address(address)) {
+    return address;
+  }
+  const parts = address.split(":");
+  const i = parts.indexOf("");
+  if (i >= 0) {
+    parts.splice(i, 1, ..."0".repeat(9 - parts.length));
+  }
+  return parts.map(s => s.padStart(4, "0")).join(":");
+}

package/types/base.d.mts

@@ -22,6 +22,9 @@ export class Base {
     expand(object: any): any;
     finalize(action: any): void;
     execFinalize(): void;
+    _finalize(): void;
+    traverse(visitor: any, ...args: any[]): void;
+    _traverse(visited: any, visitor: any, ...args: any[]): boolean;
     error(...args: any[]): void;
     info(...args: any[]): void;
     toString(): string;

package/types/model.d.mts

@@ -3,6 +3,7 @@ export class Owner extends Base {
     ntp: {
         servers: any[];
     };
+    _traverse(...args: any[]): boolean;
     get dns(): DNSService;
     hosts(): AsyncGenerator<any, void, unknown>;
     addObject(object: any): void;
@@ -58,6 +59,7 @@ export class Host extends Base {
     static prepareData(world: any, data: any): Promise<typeof Host>;
     networkInterfaces: {};
     postinstall: any[];
+    _traverse(...args: any[]): boolean;
     get deployment(): any;
     get chassis(): any;
     get vendor(): any;

package/types/utils.d.mts

@@ -4,3 +4,4 @@ export function bridgeToJSON(bridge: any): any[];
 export function asArray(value: any): any[];
 export function isIPv4Address(address: any): boolean;
 export function isIPv6Address(address: any): boolean;
+export function normalizeIPAddress(address: any): any;