pmcf 1.31.0 → 1.31.2

package/bin/pmcf-named-defs

@@ -12,13 +12,6 @@ import { prepare } from "../src/cmd.mjs";
 const { root, args, options } = await prepare();
 
 const owner = await root.load(args[0]);
-const updates = [
-  Math.ceil(Date.now() / 1000),
-  36000,
-  72000,
-  600000,
-  60000
-].join(" ");
 
 await generateNamedDefs(owner, options.output);
 
@@ -29,6 +22,7 @@ console.log("description", `named defintions for ${owner.name}`);
 async function generateNamedDefs(owner, targetDir) {
   const dns = owner.dns;
   const ttl = dns.recordTTL;
+  const updates = [Math.ceil(Date.now() / 1000), ...dns.soaUpdates].join(" ");
 
   for (const domain of dns.domains) {
     const zones = [];
@@ -42,8 +36,6 @@ async function generateNamedDefs(owner, targetDir) {
     const createRecord = (key, type, value) => {
       return {
         key,
-        /*type,
-        value,*/
         toString: () =>
           `${key.padEnd(maxKeyLength, " ")} ${ttl} IN ${type.padEnd(
             5,
@@ -106,7 +98,7 @@ async function generateNamedDefs(owner, targetDir) {
       const host = networkInterface.host;
       zone.records.add(
         createRecord(
-          host.hostName,
+          host.domainName + ".",
           isIPv4Address(address) ? "A   " : "AAAA",
           normalizeIPAddress(address)
         )

package/package.json

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

package/src/dns.mjs

@@ -4,6 +4,8 @@ import { asArray } from "./utils.mjs";
 export class DNSService extends Base {
   allowedUpdates = [];
   recordTTL = "1W";
+  soaUpdates = [36000, 72000, 600000, 60000];
+
   forwardsTo = [];
 
   static get typeName() {
@@ -32,7 +34,7 @@ export class DNSService extends Base {
   }
 
   get propertyNames() {
-    return ["recordTTL", "forwardsTo", "allowedUpdates"];
+    return ["recordTTL", "soaUpdates", "forwardsTo", "allowedUpdates"];
   }
 
   async resolvedConfig() {

package/src/model.mjs

@@ -305,7 +305,9 @@ export class Host extends Base {
   }
 
   get domainName() {
-    return this.hostName + "." + this.domain;
+    const domain = this.domain;
+    const hostName = this.hostName;
+    return domain ? hostName + "." + domain : hostName;
   }
 
   get host() {

package/types/dns.d.mts

@@ -1,6 +1,7 @@
 export class DNSService extends Base {
     allowedUpdates: any[];
     recordTTL: string;
+    soaUpdates: number[];
     forwardsTo: any[];
     services(): AsyncGenerator<any, void, any>;
     get domains(): any[];

package/types/model.d.mts

@@ -32,7 +32,7 @@ export class Host extends Base {
     get domain(): any;
     get modelName(): any;
     get hostName(): any;
-    get domainName(): string;
+    get domainName(): any;
     get host(): this;
     addService(service: any): void;
     services(filter: any): Generator<any, void, unknown>;