pmcf 1.16.0 → 1.17.1

package/bin/pmcf-host-defs

@@ -2,7 +2,7 @@
 
 import { writeFile, mkdir, copyFile, glob } from "node:fs/promises";
 import { join } from "node:path";
-import { writeLines, sectionLines } from "../src/model.mjs";
+import { writeLines, sectionLines } from "../src/utils.mjs";
 import { prepare } from "../src/cmd.mjs";
 
 const { world, args, options } = prepare();

package/bin/pmcf-location-defs

@@ -2,7 +2,7 @@
 
 import { mkdir, copyFile } from "node:fs/promises";
 import { join } from "node:path";
-import { writeLines, sectionLines } from "../src/model.mjs";
+import { writeLines, sectionLines } from "../src/utils.mjs";
 import { prepare } from "../src/cmd.mjs";
 
 const { world, args, options } = prepare();
@@ -21,7 +21,7 @@ console.log("replaces", `mf-location-${location.name}`);
 console.log("description", `location definitions for ${location.name}`);
 
 async function generateLocationDefs(location, dir) {
-  const sl = (await Array.fromAsync(location.dns.services())).map(s=>s.ipAddress);
+  const sl = (await Array.fromAsync(location.dns.services())).map(s=>s.ipAddresses).flat()
   const s1 = sl.shift();
 
   await writeLines(

package/bin/pmcf-named-defs

@@ -2,7 +2,7 @@
 
 import { join } from "node:path";
 import { createHmac } from "node:crypto";
-import { writeLines } from "../src/model.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.16.0",
+  "version": "1.17.1",
   "publishConfig": {
     "access": "public"
   },
@@ -40,7 +40,7 @@
     "lint:typescript": "tsc --allowJs --checkJs --noEmit --resolveJsonModule --target es2024 --lib esnext -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs"
   },
   "devDependencies": {
-    "@types/node": "^22.10.7",
+    "@types/node": "^22.10.9",
     "ava": "^6.2.0",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",

package/src/model.mjs

@@ -1,6 +1,7 @@
-import { readFile, writeFile, mkdir, glob } from "node:fs/promises";
+import { readFile, glob } from "node:fs/promises";
 import { join } from "node:path";
 import { getAttribute } from "pacc";
+import { asArray, bridgeToJSON } from "./utils.mjs";
 
 export class Base {
   owner;
@@ -139,6 +140,37 @@ export class Owner extends Base {
   #networks = new Map();
   #subnets = new Map();
   #bridges = new Set();
+  #dns;
+  #administratorEmail;
+  domain;
+  ntp = { servers: [] };
+
+  constructor(owner, data) {
+    super(owner, data);
+
+    let dns;
+    if (data?.dns) {
+      dns = data.dns;
+      delete data.dns;
+    }
+
+    this.#dns = new DNSService(this, dns);
+
+    if (data?.networks) {
+      const networks = data.networks;
+      delete data.networks;
+
+      for (const [name, data] of Object.entries(networks)) {
+        data.name = name;
+        new Network(this, data);
+      }
+    }
+    Object.assign(this, data);
+  }
+
+  get dns() {
+    return this.#dns;
+  }
 
   async *hosts() {
     for (const host of this.#hosts.values()) {
@@ -244,6 +276,14 @@ export class Owner extends Base {
     }
   }
 
+  async *networkAddresses() {
+    for await (const host of this.hosts()) {
+      for (const networkAddresses of host.networkAddresses()) {
+        yield networkAddresses;
+      }
+    }
+  }
+
   #resolveActions = [];
 
   resolveLater(action) {
@@ -268,6 +308,14 @@ export class Owner extends Base {
     return this.#subnets.values();
   }
 
+  get administratorEmail() {
+    return this.#administratorEmail || "admin@" + this.domain;
+  }
+
+  get propertyNames() {
+    return [...super.propertyNames, "domain", "administratorEmail", "dns"];
+  }
+
   toJSON() {
     return {
       ...super.toJSON(),
@@ -410,14 +458,6 @@ export class World extends Owner {
   async host(name) {
     return this.load(name, { type: Host });
   }
-
-  async *networkAddresses() {
-    for await (const host of this.hosts()) {
-      for (const networkAddresses of host.networkAddresses()) {
-        yield networkAddresses;
-      }
-    }
-  }
 }
 
 class DNSService extends Base {
@@ -425,6 +465,10 @@ class DNSService extends Base {
   recordTTL = "1W";
   forwardsTo = [];
 
+  static get typeName() {
+    return "dns";
+  }
+
   constructor(owner, data) {
     super(owner, data);
     Object.assign(this, data);
@@ -447,37 +491,10 @@ class DNSService extends Base {
 }
 
 export class Location extends Owner {
-  domain;
-  #dns;
-  ntp = { servers: [] };
-  #administratorEmail;
-
   static get typeName() {
     return "location";
   }
 
-  constructor(owner, data) {
-    super(owner, data);
-
-    let dns;
-    if (data.dns) {
-      dns = data.dns;
-      delete data.dns;
-    }
-
-    this.#dns = new DNSService(this, dns);
-    const networks = data.networks;
-    delete data.networks;
-    Object.assign(this, data);
-
-    if (networks) {
-      for (const [name, data] of Object.entries(networks)) {
-        data.name = name;
-        new Network(this, data);
-      }
-    }
-  }
-
   async *hosts() {
     for await (const host of this.owner.hosts()) {
       if (host.location === this) {
@@ -485,26 +502,6 @@ export class Location extends Owner {
       }
     }
   }
-
-  get dns() {
-    return this.#dns;
-  }
-
-  async *networkAddresses() {
-    for await (const host of this.hosts()) {
-      for (const networkAddresses of host.networkAddresses()) {
-        yield networkAddresses;
-      }
-    }
-  }
-
-  get administratorEmail() {
-    return this.#administratorEmail || "admin@" + this.domain;
-  }
-
-  get propertyNames() {
-    return [...super.propertyNames, "domain", "administratorEmail", "dns"];
-  }
 }
 
 export class Network extends Owner {
@@ -671,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() {
@@ -777,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 };
@@ -849,6 +848,8 @@ export class NetworkInterface extends Base {
     }
 
     Object.assign(this, data);
+
+    owner.addNetworkInterface(this);
   }
 
   get host() {
@@ -1005,40 +1006,17 @@ export class Service extends Base {
   }
 }
 
-const _types = [Location, Network, Subnet, Host, Service];
+const _types = [Location, Network, Subnet, Host, Service, DNSService];
 const _typesByName = Object.fromEntries(_types.map(t => [t.typeName, t]));
 
-export async function writeLines(dir, name, lines) {
-  await mkdir(dir, { recursive: true });
-  return writeFile(
-    join(dir, name),
-    [...lines]
-      .flat()
-      .filter(line => line !== undefined)
-      .map(l => l + "\n")
-      .join(""),
-    "utf8"
-  );
-}
-
-export function sectionLines(sectionName, values) {
-  const lines = [`[${sectionName}]`];
-
-  for (const [name, value] of Object.entries(values)) {
-    lines.push(`${name}=${value}`);
-  }
-
-  return lines;
-}
-
-function extractFrom(object, propertyNames) {
+export function extractFrom(object, propertyNames) {
   const json = {};
   for (const p of propertyNames) {
     const value = object[p];
 
     if (value !== undefined) {
-      if (value instanceof Base) {
-        json[p] = { name: object.name };
+      if (value instanceof Base && value.name) {
+        json[p] = { name: value.name };
       } else {
         json[p] = value;
       }
@@ -1046,11 +1024,3 @@ function extractFrom(object, propertyNames) {
   }
   return json;
 }
-
-function bridgeToJSON(bridge) {
-  return [...bridge].map(n => n.name || `(${n})`).sort();
-}
-
-function asArray(value) {
-  return Array.isArray(value) ? value : value === undefined ? [] : [value];
-}

package/src/utils.mjs

@@ -0,0 +1,41 @@
+import { writeFile, mkdir } from "node:fs/promises";
+import { join } from "node:path";
+
+export async function writeLines(dir, name, lines) {
+  await mkdir(dir, { recursive: true });
+  return writeFile(
+    join(dir, name),
+    [...lines]
+      .flat()
+      .filter(line => line !== undefined)
+      .map(l => l + "\n")
+      .join(""),
+    "utf8"
+  );
+}
+
+export function sectionLines(sectionName, values) {
+  const lines = [`[${sectionName}]`];
+
+  for (const [name, value] of Object.entries(values)) {
+    lines.push(`${name}=${value}`);
+  }
+
+  return lines;
+}
+
+export function bridgeToJSON(bridge) {
+  return [...bridge].map(n => n.name || `(${n})`).sort();
+}
+
+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

@@ -1,5 +1,4 @@
-export function writeLines(dir: any, name: any, lines: any): Promise<void>;
-export function sectionLines(sectionName: any, values: any): string[];
+export function extractFrom(object: any, propertyNames: any): {};
 export class Base {
     static get typeName(): string;
     static get typeFileName(): string;
@@ -28,6 +27,11 @@ export class Base {
     #private;
 }
 export class Owner extends Base {
+    domain: any;
+    ntp: {
+        servers: any[];
+    };
+    get dns(): DNSService;
     hosts(): AsyncGenerator<any, void, unknown>;
     addObject(object: any): void;
     addHost(host: any): void;
@@ -38,11 +42,13 @@ export class Owner extends Base {
     addNetwork(network: any): void;
     addBridge(network: any, destinationNetworks: any): any;
     _resolveBridges(): void;
+    networkAddresses(): AsyncGenerator<any, void, unknown>;
     resolveLater(action: any): void;
     resolve(): void;
     addSubnet(subnet: any): void;
     subnet(name: any): any;
     subnets(): MapIterator<any>;
+    get administratorEmail(): any;
     toJSON(): {
         networks: any[];
         subnets: any[];
@@ -53,7 +59,7 @@ export class Owner extends Base {
 }
 export class World extends Owner {
     static get types(): {
-        [k: string]: typeof Location | typeof Host | typeof Network | typeof Subnet | typeof Service;
+        [k: string]: typeof Location | typeof Host | typeof DNSService | typeof Network | typeof Subnet | typeof Service;
     };
     constructor(directory: any);
     get fullName(): string;
@@ -66,21 +72,9 @@ export class World extends Owner {
     domains(): AsyncGenerator<any, void, unknown>;
     location(name: any): Promise<any>;
     host(name: any): Promise<any>;
-    networkAddresses(): AsyncGenerator<{
-        address: any;
-        networkInterface: any;
-    }, void, unknown>;
     #private;
 }
 export class Location extends Owner {
-    domain: any;
-    ntp: {
-        servers: any[];
-    };
-    get dns(): DNSService;
-    networkAddresses(): AsyncGenerator<any, void, unknown>;
-    get administratorEmail(): any;
-    #private;
 }
 export class Network extends Owner {
     kind: any;
@@ -115,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

@@ -0,0 +1,6 @@
+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;