pmcf 1.25.0 → 1.26.0

package/bin/pmcf-location-defs

@@ -22,33 +22,10 @@ console.log("replaces", `mf-location-${location.name}`);
 console.log("description", `location definitions for ${location.name}`);
 
 async function generateLocationDefs(location, dir) {
-  const dns = location.dns;
-  const dnsServices = (await Array.fromAsync(dns.services())).sort(
-    (a, b) => a.priority - b.priority
-  );
-
-  console.log(dnsServices);
-
-  const master = dnsServices
-    .filter(s => s.priority < 10)
-    .map(s => s.ipAddresses)
-    .flat();
-  const fallback = dnsServices
-    .filter(s => s.priority >= 10)
-    .map(s => s.ipAddresses)
-    .flat();
-
   await writeLines(
     join(dir, "etc/systemd/resolved.conf.d"),
     `${location.name}.conf`,
-    sectionLines("Resolve", {
-      DNS: master.join(" "),
-      FallbackDNS: fallback.join(" "),
-      Domains: dns.domains.join(" "),
-      DNSSEC: "no",
-      MulticastDNS: "yes",
-      LLMNR: "no"
-    })
+    sectionLines("Resolve", await location.dns.resolvedConfig())
   );
 
   await writeLines(
@@ -75,7 +52,7 @@ async function generateLocationDefs(location, dir) {
 
   await mkdir(locationDir, { recursive: true });
 
-  copyFile(
+  await copyFile(
     join(location.directory, "location.json"),
     join(locationDir, "location.json")
   );

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();
@@ -38,10 +42,13 @@ async function generateNamedDefs(owner, targetDir) {
     const createRecord = (key, type, value) => {
       return {
         key,
-        type,
-        value,
+       /*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.25.0",
+  "version": "1.26.0",
   "publishConfig": {
     "access": "public"
   },

package/src/dns.mjs

@@ -33,4 +33,28 @@ export class DNSService extends Base {
   get propertyNames() {
     return ["recordTTL", "forwardsTo", "allowedUpdates"];
   }
+
+  async resolvedConfig() {
+    const dnsServices = (await Array.fromAsync(this.services())).sort(
+      (a, b) => a.priority - b.priority
+    );
+
+    const master = dnsServices
+      .filter(s => s.priority < 10)
+      .map(s => s.ipAddresses)
+      .flat();
+    const fallback = dnsServices
+      .filter(s => s.priority >= 10)
+      .map(s => s.ipAddresses)
+      .flat();
+
+    return {
+      DNS: master.join(" "),
+      FallbackDNS: fallback.join(" "),
+      Domains: this.domains.join(" "),
+      DNSSEC: "no",
+      MulticastDNS: "yes",
+      LLMNR: "no"
+    };
+  }
 }

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";
@@ -659,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") {

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/dns.d.mts

@@ -4,5 +4,13 @@ export class DNSService extends Base {
     forwardsTo: any[];
     services(): AsyncGenerator<any, void, any>;
     get domains(): any[];
+    resolvedConfig(): Promise<{
+        DNS: string;
+        FallbackDNS: string;
+        Domains: string;
+        DNSSEC: string;
+        MulticastDNS: string;
+        LLMNR: string;
+    }>;
 }
 import { Base } from "./base.mjs";

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;