pmcf 6.15.0 → 6.16.1

package/bin/pmcf-info

@@ -23,7 +23,7 @@ function show(value, indent = 0, short = false) {
       prefix(l) + attribute.name.padEnd(ml) + ": ";
 
     if (short) {
-      console.log(`${prefix()}${value.name}:`);
+      console.log(`${prefix()}${value[type.key]}:`);
     } else {
       console.log(`${prefix()}${value.fullName}(${type.name}):`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.15.0",
+  "version": "6.16.1",
   "publishConfig": {
     "access": "public"
   },
@@ -51,7 +51,7 @@
   },
   "dependencies": {
     "aggregated-map": "^1.0.8",
-    "content-entry-transform": "^1.6.9",
+    "content-entry-transform": "^1.7.0",
     "ip-utilties": "^3.8.1",
     "npm-pkgbuild": "^20.8.6",
     "pacc": "^10.4.1",

package/src/services/bind.mjs

@@ -8,10 +8,14 @@ import {
   FAMILY_IPV6
 } from "ip-utilties";
 import {
+  default_collection_attribute,
   default_collection_attribute_writable,
   default_attribute_writable,
   duration_attribute_writable,
+  name_attribute,
+  string_attribute,
   string_set_attribute_writable,
+  string_set_attribute,
   boolean_attribute_writable_true,
   boolean_attribute_writable_false,
   integer_attribute_writable,
@@ -39,6 +43,34 @@ import { owner_attribute } from "../common-attributes.mjs";
 
 const bindNetworkAddressTypes = networkAddressType + "|bind_group";
 
+class zone extends Base {
+  static priority = 1;
+  static key = "id";
+  static attributes = {
+    id: { ...name_attribute, name: "id" },
+    file: { ...string_attribute, name: "file" },
+    records: { ...string_set_attribute, name: "records" }
+  };
+
+  static {
+    addType(this);
+  }
+
+  records = new Set();
+
+  get domain() {
+    return this.id;
+  }
+
+  get directory() {
+    return this.source.name;
+  }
+
+  get file() {
+    return `${this.directory}/${this.domain}.zone`;
+  }
+}
+
 class bind_group extends Base {
   static priority = 1;
   static attributes = {
@@ -64,6 +96,12 @@ class bind_group extends Base {
       type: networkAddressType + "|owner",
       name: "entries"
     },
+    zones: {
+      ...default_collection_attribute,
+      type: zone,
+      backpointer: owner_attribute,
+      name: "zones"
+    },
     sharedWith: {
       ...default_attribute_writable,
       name: "sharedWith",
@@ -171,6 +209,43 @@ class bind_group extends Base {
     ];
   }
 
+  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 z = new zone();
+
+        z.id = domain;
+        z.source = source;
+        z.owner = this;
+        z.config = config;
+        z.records = new Set(this.defaultRecords);
+
+        zs.set(z.id, z);
+
+        config.zones.push(z);
+
+        for (const {
+          address,
+          subnet,
+          networkInterface,
+          domainNames,
+          family
+        } of source.networkAddresses()) {
+        //  console.log(address);
+        }
+      }
+    }
+    return zs;
+  }
+
   async packageContent(outputControl) {
     outputControl.packageData.sources.push(
       ...(await Array.fromAsync(

package/src/subnet.mjs

@@ -54,12 +54,8 @@ export class Subnet {
     }
   }
 
-  value(name) {
-    const value = getAttribute(this, name);
-
-    console.log("SUBNET VALUE", name, value);
-
-    return value;
+  attribute(name) {
+    return getAttribute(this, name);
   }
 
   *_walkDirections(directions, seen) {}