pmcf 6.10.1 → 6.10.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.10.1",
+  "version": "6.10.3",
   "publishConfig": {
     "access": "public"
   },
@@ -52,7 +52,7 @@
   "dependencies": {
     "aggregated-map": "^1.0.7",
     "content-entry-transform": "^1.6.9",
-    "ip-utilties": "^3.7.1",
+    "ip-utilties": "^3.7.4",
     "npm-pkgbuild": "^20.8.2",
     "pacc": "^10.4.1",
     "package-directory": "^8.2.0",

package/src/base.mjs

@@ -516,7 +516,7 @@ export class Base {
 
       try {
         if ((await stat(dir)).isDirectory) {
-          console.log("TD", dir);
+          //console.log("TD", dir);
           yield transform(
             new FileContentProvider(
               { dir, pattern: "**/*" },

package/src/services/bind.mjs

@@ -372,11 +372,7 @@ class bind_group extends Base {
           content.push(`  type ${config.type};`);
           content.push(`  file \"${zone.file}\";`);
           content.push(
-            `  allow-update { ${
-              this.allowedUpdates.length
-                ? this.allowedUpdates.join(";")
-                : "none"
-            }; };`
+            addressesStatement("  allow-update", this.allowedUpdates, "none;")
           );
           content.push(`  notify ${yesno(this.notify)};`);
         }
@@ -407,13 +403,19 @@ class bind_group extends Base {
   }
 }
 
-function addressesStatement(prefix, objects, generateEmpty = false) {
-  const body = asArray(objects).map(name => `  ${name};`);
+function addressesStatement(prefix, objects, empty = false) {
+  const body = asArray(objects).map(
+    value => `  ${typeof value === "string" ? value : value.name};`
+  );
 
-  if (body.length || generateEmpty) {
+  if (body.length) {
     return [`${prefix} {`, body, "};"];
   }
 
+  if (empty) {
+    return [`${prefix} {`, empty, "};"];
+  }
+
   return [];
 }
 

package/src/subnet.mjs

@@ -2,7 +2,6 @@ import {
   normalizeCIDR,
   rangeIP,
   decodeIP,
-  familyIP,
   matchPrefixIP,
   FAMILY_IPV6
 } from "ip-utilties";
@@ -35,13 +34,13 @@ export class Subnet {
   networks = new Set();
 
   constructor(address) {
-    const { longPrefix, prefix, prefixLength, cidr } = normalizeCIDR(address);
+    const { longPrefix, prefix, prefixLength, cidr, family } = normalizeCIDR(address);
 
     this.address = cidr;
     this.prefix = prefix;
     this.prefixLength = prefixLength;
     this.longPrefix = longPrefix;
-    this.family = familyIP(address);
+    this.family = family;
   }
 
   get owner() {