pmcf 6.16.4 → 6.17.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.16.4",
+  "version": "6.17.1",
   "publishConfig": {
     "access": "public"
   },
@@ -52,7 +52,7 @@
   "dependencies": {
     "aggregated-map": "^1.0.8",
     "content-entry-transform": "^1.7.0",
-    "ip-utilties": "^3.8.1",
+    "ip-utilties": "^3.9.0",
     "npm-pkgbuild": "^20.8.6",
     "pacc": "^10.4.1",
     "package-directory": "^8.2.0",

package/src/services/bind.mjs

@@ -43,7 +43,7 @@ import { owner_attribute } from "../common-attributes.mjs";
 
 const bindNetworkAddressTypes = networkAddressType + "|bind_group";
 
-class zone extends Base {
+class bind_zone extends Base {
   static priority = 1;
   static key = "id";
   static attributes = {
@@ -56,8 +56,6 @@ class zone extends Base {
     addType(this);
   }
 
-  records = new Set();
-
   get name() {
     return this.id;
   }
@@ -77,6 +75,39 @@ class zone extends Base {
   get file() {
     return `${this.directory}/${this.domain}.zone`;
   }
+
+  constructor(owner, id, config, source) {
+    super();
+    this.id = id;
+    this.config = config;
+    this.source = source;
+    this.records = new Set(owner.defaultRecords);
+
+    config.zones.push(this);
+  }
+}
+
+class bind_zone_config extends Base {
+  static priority = 1;
+  static attributes = {
+    zones: { ...default_collection_attribute, type: bind_zone, name: "zones" }
+  };
+
+  static {
+    addType(this);
+  }
+
+  zones = [];
+
+  get type() {
+    return this.owner.service.serverType;
+  }
+
+  constructor(owner, name) {
+    super();
+    this.owner = owner;
+    this.name = name;
+  }
 }
 
 class bind_group extends Base {
@@ -104,12 +135,22 @@ class bind_group extends Base {
       type: networkAddressType + "|owner",
       name: "entries"
     },
+    domains: {
+      ...string_set_attribute,
+      name: "domains"
+    },
     zones: {
       ...default_collection_attribute,
-      type: zone,
+      type: bind_zone,
       backpointer: owner_attribute,
       name: "zones"
     },
+    zoneConfigs: {
+      ...default_collection_attribute,
+      type: bind_zone_config,
+      backpointer: owner_attribute,
+      name: "zoneConfigs"
+    },
     sharedWith: {
       ...default_attribute_writable,
       name: "sharedWith",
@@ -163,6 +204,7 @@ class bind_group extends Base {
   access = [];
   allowedUpdates = [];
   entries = [];
+  zoneConfigs = [];
   exclude = new Set();
   excludeInterfaceKinds = new Set();
   notify = true;
@@ -217,29 +259,27 @@ class bind_group extends Base {
     ];
   }
 
+  get domains() {
+    return this.entries.reduce(
+      (all, net) => all.union(net.localDomains),
+      new Set()
+    );
+  }
+
   get zones() {
     const zs = new Map();
 
+    
     for (const source of this.entries) {
       for (const domain of source.localDomains) {
-        const config = {
-          name: `${domain}.zone.conf`,
-          type: this.service.serverType,
-          zones: []
-        };
+        const config = new bind_zone_config(this, `${domain}.zone.conf`);
 
-        const z = new zone();
+        this.zoneConfigs.push(config);
 
-        z.id = domain;
-        z.source = source;
-        z.owner = this;
-        z.config = config;
-        z.records = new Set(this.defaultRecords);
+        const z = new bind_zone(this, domain, config, source);
 
         zs.set(z.id, z);
 
-        config.zones.push(z);
-
         for (const {
           address,
           subnet,