pmcf 1.48.0 → 1.48.2

package/bin/pmcf-host-defs

@@ -15,7 +15,10 @@ const host = await root.load(hostName, { type: types.host });
 await generateNetworkDefs(host, options.output);
 await generateMachineInfo(host, options.output);
 await copySshKeys(host, options.output);
-await generateKnownHosts(host.owner.hosts(), join(options.output, "root", ".ssh"));
+await generateKnownHosts(
+  host.owner.hosts(),
+  join(options.output, "root", ".ssh")
+);
 
 console.log("provides", "host", ...host.provides);
 console.log("depends", `location-${host.location.name}`, ...host.depends);
@@ -165,6 +168,7 @@ async function generateKnownHosts(hosts, dir) {
   for await (const host of hosts) {
     try {
       const [alg, key, desc] = (await host.publicKey("ed25519")).split(/\s+/);
+
       keys.push(`${host.domainName} ${alg} ${key}`);
 
       for await (const addr of host.networkAddresses()) {

package/bin/pmcf-named-defs

@@ -32,7 +32,7 @@ async function generateNamedDefs(owner, targetDir) {
     const zones = [];
     const records = new Set();
 
-    const nameserver = (await owner.service({ type: "dns" }))?.owner;
+    const nameserver = (await owner.findService({ type: "dns" }))?.owner;
     const rname = dns.administratorEmail.replace(/@/, ".");
 
     let maxKeyLength;

package/package.json

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

package/src/host.mjs

@@ -1,3 +1,5 @@
+import { readFile } from "node:fs/promises";
+import { join } from "node:path";
 import { Base } from "./base.mjs";
 import { networkProperties } from "./network-support.mjs";
 import {

package/src/utils.mjs

@@ -3,9 +3,10 @@ import { join } from "node:path";
 
 export async function writeLines(dir, name, lines) {
   await mkdir(dir, { recursive: true });
+  if (typeof lines === "string") lines = [lines];
   return writeFile(
     join(dir, name),
-    [...asArray(lines)]
+    [...lines]
       .flat()
       .filter(line => line !== undefined)
       .map(l => l + "\n")
@@ -130,9 +131,8 @@ export function encodeIP(address) {
   return _encode(isIPv4Address(address) ? ipv4 : ipv6, address);
 }
 
-export function formatCIDR(address,subnet)
-{
-  return subnet ? `${address}/${subnet.prefixLength}`: address;
+export function formatCIDR(address, subnet) {
+  return subnet ? `${address}/${subnet.prefixLength}` : address;
 }
 
 export function normalizeCIDR(address) {
@@ -164,8 +164,7 @@ export function normalizeCIDR(address) {
   return { prefix, prefixLength, cidr: `${prefix}/${prefixLength}` };
 }
 
-export function hasWellKnownSubnet(address)
-{
+export function hasWellKnownSubnet(address) {
   const n = encodeIP(address);
   return n === IPV4_LOCALHOST || n === IPV6_LOCALHOST || isLinkLocal(address);
 }

package/types/host.d.mts

@@ -181,7 +181,7 @@ export class Host extends Base {
     get rawAddress(): any;
     get rawAddresses(): any[];
     get cidrAddresses(): any[];
-    publicKey(type?: string): Promise<any>;
+    publicKey(type?: string): Promise<string>;
     #private;
 }
 export class NetworkInterface extends Base {