pmcf 1.48.1 → 1.49.0

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.1",
+  "version": "1.49.0",
   "publishConfig": {
     "access": "public"
   },

package/src/base.mjs

@@ -240,6 +240,10 @@ export class Base {
     return this.owner?.network;
   }
 
+  get domain() {
+    return this.owner?.domain;
+  }
+
   get administratorEmail() {
     return this.owner?.administratorEmail;
   }

package/src/owner.mjs

@@ -31,7 +31,6 @@ export class Owner extends Base {
   #membersByType = new Map();
   #bridges = new Set();
   #administratorEmail;
-  domain;
   ntp;
 
   static {
@@ -285,9 +284,20 @@ export class Owner extends Base {
       return this.owner.administratorEmail;
     }
 
+    //console.log("administratorEmail", this.domain, this.toString());
     return "admin@" + this.domain;
   }
 
+  #domain;
+
+  set domain(value) {
+    this.#domain = value;
+  }
+
+  get domain() {
+    return this.#domain || this.owner?.domain;
+  }
+
   *domains() {
     for (const location of this.locations()) {
       yield location.domain;

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

@@ -51,6 +51,7 @@ export class Base {
     get location(): any;
     get host(): any;
     get network(): any;
+    get domain(): any;
     get administratorEmail(): any;
     set directory(directory: any);
     get directory(): any;

package/types/host.d.mts

@@ -165,7 +165,6 @@ export class Host extends Base {
     get os(): any;
     set distribution(value: any);
     get distribution(): any;
-    get domain(): any;
     get modelName(): any;
     get hostName(): string;
     get domainName(): string;

package/types/owner.d.mts

@@ -137,7 +137,6 @@ export class Owner extends Base {
             };
         };
     };
-    domain: any;
     ntp: any;
     _traverse(...args: any[]): boolean;
     named(name: any): any;
@@ -164,6 +163,8 @@ export class Owner extends Base {
     networkAddresses(): Generator<any, void, any>;
     set administratorEmail(value: any);
     get administratorEmail(): any;
+    set domain(value: any);
+    get domain(): any;
     domains(): Generator<any, void, unknown>;
     #private;
 }