pmcf 6.16.4 → 6.17.0

package/package.json

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

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 = {
@@ -79,6 +79,20 @@ class zone extends Base {
   }
 }
 
+class bind_zone_config extends Base {
+  static priority = 1;
+  static attributes = {
+    type: { ...string_attribute, name: "type" },
+    zones: { ...default_collection_attribute, type: bind_zone, name: "zones" }
+  };
+
+  static {
+    addType(this);
+  }
+
+  zones = [];
+}
+
 class bind_group extends Base {
   static priority = 1;
   static attributes = {
@@ -104,9 +118,13 @@ 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"
     },
@@ -217,18 +235,24 @@ 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();
+
+        config.name = `${domain}.zone.conf`;
+        config.type = this.service.serverType;
 
-        const z = new zone();
+        const z = new bind_zone();
 
         z.id = domain;
         z.source = source;