pmcf 6.20.2 → 6.21.0

package/bin/pmcf-info

@@ -16,6 +16,8 @@ function show(value, indent = 0, short = false) {
     case "number":
     case "bigint":
       console.log(value);
+
+    case "undefined":
       return;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.20.2",
+  "version": "6.21.0",
   "publishConfig": {
     "access": "public"
   },
@@ -53,8 +53,8 @@
     "aggregated-map": "^1.0.10",
     "content-entry-transform": "^1.7.0",
     "ip-utilties": "^3.10.1",
-    "npm-pkgbuild": "^20.8.11",
-    "pacc": "^11.0.2",
+    "npm-pkgbuild": "^20.8.13",
+    "pacc": "^11.0.3",
     "package-directory": "^8.2.0",
     "yaml": "^2.9.0"
   },

package/src/common-attributes.mjs

@@ -3,6 +3,7 @@ import {
   default_attribute_writable,
   default_collection_attribute_writable,
   string_collection_attribute_writable,
+  string_set_attribute_writable,
   string_attribute_writable,
   integer_attribute_writable,
   hostname_attribute as hostname_attribute_base,
@@ -11,6 +12,8 @@ import {
 
 export const networkAddressType = "network|host|network_interface";
 
+export const aliases_attribute = { ...string_set_attribute_writable, name: "aliases" };
+
 export const owner_attribute = {
   ...default_attribute,
   name: "owner",

package/src/core-service.mjs

@@ -20,8 +20,11 @@ import {
   FAMILY_UNIX,
   FAMILY_DNS
 } from "pmcf";
-import { asArray } from "./utils.mjs";
-import { networkAddressAttributes } from "./common-attributes.mjs";
+import { asArray, union } from "./utils.mjs";
+import {
+  networkAddressAttributes,
+  aliases_attribute
+} from "./common-attributes.mjs";
 import {
   serviceTypeEndpoints,
   serviceTypes,
@@ -72,7 +75,7 @@ export class CoreService extends Base {
       name: "extends",
       type: CoreService
     },
-    alias: { ...string_attribute_writable, name: "alias" },
+    aliases: aliases_attribute,
     priority: priority_attribute,
     weight: { ...number_attribute_writable, name: "weight" /*default: 1*/ },
     systemdService: { ...string_attribute_writable, name: "systemdService" },
@@ -84,7 +87,7 @@ export class CoreService extends Base {
     addType(this);
   }
 
-  _alias;
+  _aliases = new Set();
   _weight;
   _port;
   _systemdService;
@@ -208,12 +211,14 @@ export class CoreService extends Base {
     return options.join !== undefined ? res.join(options.join) : res;
   }
 
-  set alias(value) {
-    this._alias = value;
+  set aliases(value) {
+    this._aliases = union(value, this._aliases);
   }
 
-  get alias() {
-    return this.attribute("_alias");
+  get aliases() {
+    return this.expand(
+      this.unionFromDirections(["this", "extends"], "_aliases")
+    );
   }
 
   set port(value) {
@@ -301,8 +306,13 @@ export class CoreService extends Base {
 
   dnsRecordsForDomainName(domainName, hasSVRRecords) {
     const records = [];
-    if (this.priority >= 390 && this.alias) {
-      records.push(DNSRecord(this.alias, "CNAME", dnsFullName(domainName)));
+
+    if (this.priority >= 390) {
+      console.log("DNS SERVICE ALIAS", this.aliases, dnsFullName(domainName));
+
+      for (const alias of this.aliases) {
+        records.push(DNSRecord(alias, "CNAME", dnsFullName(domainName)));
+      }
     }
 
     if (hasSVRRecords) {

package/src/host.mjs

@@ -14,7 +14,8 @@ import { addresses, addType, assign } from "pmcf";
 import {
   networkAddressAttributes,
   networkInterfaces_attribute,
-  hosts_attribute
+  hosts_attribute,
+  aliases_attribute
 } from "./common-attributes.mjs";
 import { ServiceOwner } from "./service-owner.mjs";
 import { addHook } from "./hooks.mjs";
@@ -34,7 +35,7 @@ export class Host extends ServiceOwner {
   static attributes = {
     ...networkAddressAttributes,
     networkInterfaces: networkInterfaces_attribute,
-    aliases: { ...string_set_attribute_writable, name: "aliases" },
+    aliases: aliases_attribute,
     os: {
       ...string_attribute_writable,
       name: "os",

package/src/services/bind.mjs

@@ -10,6 +10,7 @@ import {
   name_attribute,
   string_attribute,
   string_set_attribute,
+  boolean_attribute,
   boolean_attribute_writable_true,
   boolean_attribute_writable_false,
   integer_attribute_writable,
@@ -44,13 +45,18 @@ class bind_zone extends Base {
   static attributes = {
     id: { ...name_attribute, name: "id" },
     file: { ...string_attribute, name: "file" },
-    records: { ...string_set_attribute, name: "records" }
+    records: { ...string_set_attribute, name: "records" },
+    foreign: { ...boolean_attribute, name: "foreign" }
   };
 
   static {
     addType(this);
   }
 
+  get isCatalog() {
+    return false;
+  }
+
   get name() {
     return this.id;
   }
@@ -68,7 +74,7 @@ class bind_zone extends Base {
   }
 
   constructor(owner, id, config, location) {
-    super();
+    super(owner);
     this.id = id;
     this.config = config;
     this.directory = location;
@@ -84,7 +90,8 @@ class bind_zone extends Base {
 
 class catalog_zone extends bind_zone {
   static attributes = {
-    version: { ...string_attribute, name: "version" }
+    version: { ...string_attribute, name: "version" },
+    isCatalog: { ...boolean_attribute, name: "isCatalog" }
   };
 
   static {
@@ -115,7 +122,7 @@ class bind_zone_config extends Base {
     addType(this);
   }
 
-  zones = [];
+  /** @type {bind_zone[]} */ zones = [];
 
   get type() {
     return this.owner.service.serverType;
@@ -126,10 +133,11 @@ class bind_zone_config extends Base {
     this.name = name;
   }
 
-  async write(outputControl, group) {
+  async write(outputControl) {
     const dir = outputControl.dir;
+    const group = this.owner;
 
-    console.log(`config: ${group.name}/${this.name}`);
+    console.log(`config: ${group.name}/${this.name}${this.foreign ? " foreign" : ""}`);
 
     const content = [];
 
@@ -306,13 +314,6 @@ class bind_group extends Base {
   get defaultRecords() {
     const service = this.service;
 
-    /*console.log(
-      "nameService",
-      service.fullName,
-      service.domainName,
-      service.address()
-    );*/
-
     return [
       DNSRecord(
         "@",
@@ -361,7 +362,6 @@ class bind_group extends Base {
   get zones() {
     const entries = [...this.entries];
 
-
     if (!this._zones && entries.length > 0) {
       this._zoneConfigs = new Map();
       this._zones = new Map();
@@ -418,6 +418,7 @@ class bind_group extends Base {
                   domain => new bind_zone_config(this, `${domain}.zone.conf`)
                 );
 
+                config.foreign = true;
                 const zone = this._zones.getOrInsertComputed(
                   foreignDomain,
                   domain =>
@@ -427,6 +428,8 @@ class bind_group extends Base {
                     )
                 );
 
+                zone.foreign = true;
+
                 for (const na of host.networkAddresses(
                   na => na.networkInterface.kind !== "loopback"
                 )) {
@@ -448,10 +451,6 @@ class bind_group extends Base {
                     );
                   }
                 }
-
-                /*zone.records.add(
-                  DNSRecord("outfacing", "PTR", dnsFullName(foreignDomain))
-                );*/
               }
 
               const sm = new Map();
@@ -534,7 +533,7 @@ class bind_group extends Base {
 
   async generateZoneDefs(outputControl) {
     for (const config of this.zoneConfigs.values()) {
-      await config.write(outputControl, this);
+      await config.write(outputControl);
     }
 
     if (this.foreignDomains.size) {
@@ -549,6 +548,14 @@ class bind_group extends Base {
   }
 }
 
+/**
+ *
+ * @param {string} prefix
+ * @param {any} objects
+ * @param {boolean|string} empty
+ * @param {string} indent
+ * @returns {string[]}
+ */
 function addressesStatement(prefix, objects, empty = false, indent = "") {
   const body = asArray(objects).map(
     value => `${indent}  ${typeof value === "string" ? value : value.name};`
@@ -664,7 +671,7 @@ export class bind extends ExtraSourceService {
       new FileContentProvider(dir + "/", ...permissions)
     );
 
-    const outputControl = newOutputControl(packageData, dir, permissions);
+    const outputControl = { packageData, dir, permissions };
 
     for (const group of this.groups.values()) {
       const present = await group.packageContent(outputControl);
@@ -678,7 +685,3 @@ export class bind extends ExtraSourceService {
     }
   }
 }
-
-function newOutputControl(packageData, dir, permissions) {
-  return { packageData, dir, permissions };
-}