pmcf 1.23.4 → 1.23.5

package/bin/pmcf-named-defs

@@ -16,8 +16,6 @@ const updates = [
   60000
 ].join(" ");
 
-const NAME_LEN = 35;
-
 await generateNamedDefs(owner, options.output);
 
 console.log("depends", "mf-named");
@@ -35,13 +33,15 @@ async function generateNamedDefs(owner, targetDir) {
     const nameserver = (await owner.service({ type: "dns" }))?.owner;
     const rname = dns.administratorEmail.replace(/@/, ".");
 
+    let maxKeyLength;
+
     const createRecord = (key, type, value) => {
       return {
         key,
         type,
         value,
         toString: () =>
-          `${key.padEnd(NAME_LEN, " ")} ${ttl} IN ${type} ${value}`
+          `${key.padEnd(maxKeyLength, " ")} ${ttl} IN ${type.padEnd(5, " ")} ${value}`
       };
     };
 
@@ -148,7 +148,7 @@ async function generateNamedDefs(owner, targetDir) {
       if (zone !== catalogZone) {
         const hash = createHmac("md5", zone.id).digest("hex");
         catalogZone.records.add(
-          `${hash}.zones.${domain}. IN PTR   ${zone.id}.`
+          createRecord(`${hash}.zones.${domain}.`, "PTR", `${zone.id}.`)
         );
       }
 
@@ -165,6 +165,13 @@ async function generateNamedDefs(owner, targetDir) {
       zoneConfig.push(`};`);
       zoneConfig.push("");
 
+      maxKeyLength = 0;
+      for (const r of zone.records) {
+        if (r.key.length > maxKeyLength) {
+          maxKeyLength = r.key.length;
+        }
+      }
+
       writeLines(join(targetDir, "var/lib/named"), zone.file, zone.records);
     }
 

package/package.json

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

package/src/model.mjs

@@ -938,7 +938,7 @@ export class Service extends Base {
 
   get srvPrefix() {
     const st = ServiceTypes[this.type];
-    if (st) {
+    if (st?.protocol) {
       return `_${this.type}._${st.protocol}`;
     }
   }