pmcf 6.14.0 → 6.16.0

package/bin/pmcf-info

@@ -10,17 +10,23 @@ for (const expression of args) {
   show(result);
 }
 
-function show(value, indent = 0) {
+function show(value, indent = 0, short = false) {
   if (value instanceof Iterator) {
     for (const v of value) {
-      show(v);
+      show(v, indent);
     }
   } else {
     const type = value.constructor;
-    console.log(`${" ".repeat(indent)}${value.fullName}(${type.name}):`);
-
+    const prefix = (l = indent) => " ".repeat(l * 2);
     const ml = maxNameLength(type);
-    const name = attribute => "  " + attribute.name.padEnd(ml) + ": ";
+    const name = (attribute, l = indent + 1) =>
+      prefix(l) + attribute.name.padEnd(ml) + ": ";
+
+    if (short) {
+      console.log(`${prefix()}${value[type.key]}:`);
+    } else {
+      console.log(`${prefix()}${value.fullName}(${type.name}):`);
+    }
 
     for (const [path, attribute] of extendingAttributeIterator(
       type,
@@ -30,7 +36,10 @@ function show(value, indent = 0) {
       const v = value.attribute(attribute.name);
       if (v !== undefined) {
         if (attribute.collection) {
-          console.log(`${name(attribute)}${[...v]}`);
+          const l = [...v];
+          if (l.length) {
+            console.log(`${name(attribute)}${l}`);
+          }
         } else {
           console.log(`${name(attribute)}${v}`);
         }
@@ -44,15 +53,22 @@ function show(value, indent = 0) {
       const v = value[attribute.name];
       if (v !== undefined) {
         if (attribute.collection) {
-          console.log(name(attribute));
-
           if (attribute.backpointer) {
+            console.log(name(attribute));
             for (const o of v.values()) {
-              show(o, indent + 2);
+              show(o, indent + 2, true);
             }
           } else {
-            for (const o of v.values()) {
-              console.log(" ".repeat(indent + 2) + o.fullName);
+            const l = [...v];
+
+            if (l.length > 1) {
+              console.log(name(attribute));
+
+              for (const o of l) {
+                console.log(prefix(indent + 2) + o.fullName);
+              }
+            } else if (l.length === 1) {
+              console.log(name(attribute) + l[0].fullName);
             }
           }
         } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.14.0",
+  "version": "6.16.0",
   "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,13 +8,18 @@ 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,
+  integer_attribute,
   name_attribute_writable
 } from "pacc";
 import {
@@ -38,10 +43,39 @@ 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 = {
     name: name_attribute_writable,
+    order: { ...integer_attribute, name: "order" },
     access: {
       type: bindNetworkAddressTypes,
       name: "access",
@@ -62,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",
@@ -148,27 +188,64 @@ class bind_group extends Base {
   }
 
   get defaultRecords() {
-    const nameService = this.owner;
+    const service = this.service;
 
-    console.log(
+    /*console.log(
       "nameService",
-      nameService.fullName,
-      nameService.domainName,
-      nameService.address()
-    );
+      service.fullName,
+      service.domainName,
+      service.address()
+    );*/
 
     return [
       DNSRecord(
         "@",
         "SOA",
-        dnsFullName(nameService.domainName),
+        dnsFullName(service.domainName),
         dnsFullName(this.administratorEmail.replace(/@/, ".")),
         `(${this.soaUpdates.join(" ")})`
       ),
-      DNSRecord("@", "NS", dnsFullName(nameService.address()))
+      DNSRecord("@", "NS", dnsFullName(service.address()))
     ];
   }
 
+  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(
@@ -557,7 +634,7 @@ export class bind extends ExtraSourceService {
     const present = await this.writeForwarders(outputControl);
 
     if (hasContent || present) {
-      console.log(packageData);
+      //console.log(packageData);
       yield packageData;
     }
   }