pmcf 6.26.4 → 6.27.0

package/README.md

@@ -79,30 +79,30 @@ generates config packages for:
 *   [domainNames](#domainnames)
 *   [InitializationContext](#initializationcontext)
     *   [Parameters](#parameters-14)
+*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
+    *   [networkAddresses](#networkaddresses)
+        *   [Parameters](#parameters-15)
 *   [zones](#zones)
 *   [type](#type)
 *   [addressesStatement](#addressesstatement)
-    *   [Parameters](#parameters-15)
+    *   [Parameters](#parameters-16)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-16)
+        *   [Parameters](#parameters-17)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-17)
+        *   [Parameters](#parameters-18)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-18)
+    *   [Parameters](#parameters-19)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-19)
-*   [cidrAddresses](#cidraddresses)
     *   [Parameters](#parameters-20)
-*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
-    *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-21)
+*   [cidrAddresses](#cidraddresses)
+    *   [Parameters](#parameters-21)
 *   [families](#families)
 *   [secretName](#secretname)
 *   [directHosts](#directhosts)
@@ -301,6 +301,18 @@ Keeps track of all in flight object creations and loose ends during config initi
 
 *   `directory`   (optional, default `"/"`)
 
+## SkeletonNetworkInterface
+
+**Extends ServiceOwner**
+
+### networkAddresses
+
+#### Parameters
+
+*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
+
+Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
+
 ## zones
 
 Type: [Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)\<bind\_zone>
@@ -397,18 +409,6 @@ Returns **Iterable<[string](https://developer.mozilla.org/docs/Web/JavaScript/Re
 
 Returns **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;
 
-## SkeletonNetworkInterface
-
-**Extends ServiceOwner**
-
-### networkAddresses
-
-#### Parameters
-
-*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
-
-Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
-
 ## families
 
 Returns **[Set](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Set)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;

package/package.json

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

package/src/base.mjs

@@ -430,7 +430,7 @@ export class Base {
       root: this.root,
       current: this,
       valueFor: (name, at) =>
-        at === undefined ? globals[name] : at.value(name),
+        typeof at?.value === "function" ? at.value(name) : globals[name],
       ...options
     });
   }
@@ -622,7 +622,7 @@ export class Base {
       root: this.root,
       current: this,
       valueFor: (name, at) =>
-        at === undefined ? globals[name] : at.value(name)
+        typeof at?.value === "function" ? at.value(name) : globals[name]
     });
   }
 

package/src/common-attributes.mjs

@@ -5,6 +5,7 @@ import {
   string_collection_attribute_writable,
   string_set_attribute_writable,
   string_attribute_writable,
+  string_attribute,
   integer_attribute_writable,
   hostname_attribute as hostname_attribute_base,
   boolean_attribute_writable
@@ -88,6 +89,8 @@ export const bridges_attribute = {
   backpointer: { ...networks_attribute, name: "bridges" }
 };
 
+export const family_attribute = { ...string_attribute, name: "family" };
+
 export const psk_attribute = { ...string_attribute_writable, name: "psk" };
 export const ssid_attribute = { ...string_attribute_writable, name: "ssid" };
 export const hostname_attribute = {

package/src/core-service.mjs

@@ -1,5 +1,6 @@
 import { FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
 import {
+  string_attribute,
   string_attribute_writable,
   number_attribute_writable,
   string_set_attribute_writable,
@@ -44,7 +45,8 @@ export const endpointAttributes = {
     values: new Set(["tcp", "udp", "quic"])
   },
   types: { ...string_set_attribute_writable, name: "types" },
-  tls: { ...boolean_attribute_false, name: "tls" }
+  tls: { ...boolean_attribute_false, name: "tls" },
+  address: { ...string_attribute, name: "address" }
 };
 
 export class CoreService extends Base {

package/src/endpoint.mjs

@@ -1,16 +1,18 @@
+import { getAttribute, string_attribute, url_attribute } from "pacc";
 import { FAMILY_IPV6 } from "ip-utilties";
 import { addType } from "pmcf";
 import { endpointAttributes, CoreService } from "./core-service.mjs";
+import { family_attribute } from "./common-attributes.mjs";
 
 export const FAMILY_UNIX = "unix";
 export const FAMILY_DNS = "dns";
 
 class BaseEndpoint {
-  static name = "endpoint";
+  static name = "base_endpoint";
   static priority = 1.1;
   static owners = [CoreService, "network_interface"];
   static key = "type";
-  attributes = endpointAttributes;
+  static attributes = endpointAttributes;
 
   static {
     addType(this);
@@ -26,6 +28,10 @@ class BaseEndpoint {
     }
   }
 
+  get fullName() {
+    return this.service.fullName + "/" + this.type;
+  }
+
   get type() {
     return this._type?.name ?? this.service.type;
   }
@@ -37,12 +43,26 @@ class BaseEndpoint {
   toString() {
     return `${this.type}`;
   }
+
+  attribute(name) {
+    return getAttribute(this, name);
+  }
+
+  value(name) {
+    return this.attribute(name);
+  }
 }
 
 /**
  * Endpoint with an ip port
  */
 class PortEndpoint extends BaseEndpoint {
+  static name = "port_endpoint";
+
+  static {
+    addType(this);
+  }
+
   _port;
   constructor(service, data) {
     super(service, data);
@@ -78,6 +98,15 @@ class PortEndpoint extends BaseEndpoint {
 }
 
 export class Endpoint extends PortEndpoint {
+  static name = "endpoint";
+  static attributes = {
+    family: family_attribute
+  };
+
+  static {
+    addType(this);
+  }
+
   constructor(service, networkAddress, data) {
     super(service, data);
     this.networkAddress = networkAddress;
@@ -105,6 +134,15 @@ export class Endpoint extends PortEndpoint {
 }
 
 export class DomainNameEndpoint extends PortEndpoint {
+  static name = "domain_endpoint";
+  static attributes = {
+    domainName: { ...string_attribute, name: "domainName" }
+  };
+
+  static {
+    addType(this);
+  }
+
   constructor(service, domainName, data) {
     super(service, data);
     this.domainName = domainName;
@@ -131,6 +169,15 @@ export class DomainNameEndpoint extends PortEndpoint {
  * Endpoint based on http
  */
 export class HTTPEndpoint extends BaseEndpoint {
+  static name = "url_endpoint";
+  static attributes = {
+    url: url_attribute
+  };
+
+  static {
+    addType(this);
+  }
+
   /**
    *
    * @param {Service} service
@@ -194,6 +241,15 @@ export class HTTPEndpoint extends BaseEndpoint {
 }
 
 export class UnixEndpoint extends BaseEndpoint {
+  static name = "unix_endpoint";
+  static attributes = {
+    url: url_attribute
+  };
+
+  static {
+    addType(this);
+  }
+
   constructor(service, path, data) {
     super(service, data);
     this.path = path;

package/src/host.mjs

@@ -246,6 +246,13 @@ export class Host extends ServiceOwner {
     return parts[parts.length - 1].toLowerCase();
   }
 
+  get services() {
+    return new AggregatedMap([
+      this._services,
+      ...this._networkInterfaces.values().map(ni => ni._services)
+    ]);
+  }
+
   get foreignDomainNames() {
     return [...this.aliases].filter(n => n.split(".").length > 1);
   }
@@ -341,7 +348,6 @@ export class Host extends ServiceOwner {
 
     if (!this.isTemplate && networkInterface.network) {
       assign(hosts_attribute, networkInterface.network, this);
-      //networkInterface.network.hosts = this;
     }
   }
 

package/src/network-address.mjs

@@ -2,13 +2,14 @@ import {
   default_attribute,
   string_attribute,
   name_attribute,
+  type_attribute,
   getAttribute
 } from "pacc";
-
 import { familyIP, formatCIDR, decodeIP, addressType } from "ip-utilties";
 import { Subnet } from "./subnet.mjs";
 import { Owner, addType } from "pmcf";
 import { NetworkInterface } from "./network-interfaces/network-interface.mjs";
+import { family_attribute } from "./common-attributes.mjs";
 
 /**
  *
@@ -19,14 +20,14 @@ export class NetworkAddress {
   static key = "address";
   static attributes = {
     address: { ...name_attribute, name: "address" },
-    type: { ...string_attribute, name: "type" },
+    type: type_attribute,
     cidrAddress: { ...string_attribute, name: "cidrAddress" },
     networkInterface: {
       ...default_attribute,
       name: "networkInterface",
       type: "network_interface"
     },
-    family: { ...string_attribute, name: "family" }
+    family: family_attribute
   };
 
   static {

package/src/services/bind.mjs

@@ -20,12 +20,11 @@ import {
 } from "pacc";
 import {
   Base,
-  ExtraSourceService,
-  serviceEndpoints,
+  CoreService,
+  Endpoint,
   addresses,
   networkAddressType,
-  addType,
-  FAMILY_DNS
+  addType
 } from "pmcf";
 import { yesno, writeLines, asArray } from "../utils.mjs";
 import {
@@ -572,11 +571,13 @@ function addressesStatement(prefix, objects, empty = false, indent = "") {
   return [];
 }
 
-export class bind extends ExtraSourceService {
+export class bind extends CoreService {
   static attributes = {
     forwarders: {
-      ...default_collection_attribute,
-      name: "forwarders"
+      ...default_collection_attribute_writable,
+      type: Endpoint,
+      name: "forwarders",
+      deferredExpression: true
     },
     groups: {
       ...default_collection_attribute_writable,
@@ -640,21 +641,18 @@ export class bind extends ExtraSourceService {
     return this.primaries ? "secondary" : "primary";
   }
 
-  get forwarders() {
-    const forwarders = serviceEndpoints(this.source, {
-      services: "services[types[dns] && priority>=100 && priority<200]",
-      endpoints: endpoint => endpoint.family !== FAMILY_DNS,
-      select: e => e.address,
-      limit: 5
-    });
-
-    return forwarders;
-  }
-
   async writeForwarders(outputControl) {
-    const forwarders = this.forwarders;
+    // TODO formulate everything as pacc expression
+    const forwarders = [...this.forwarders]
+      .map(e => e.endpoints())
+      .flat()
+      .filter(e => e.networkAddress)
+      .map(e => e.networkAddress?.address);
 
     if (forwarders.length) {
+      if (forwarders.length > 5) {
+        forwarders.length = 5;
+      }
       await writeLines(
         join(outputControl.dir, "etc/named/options"),
         `forwarders.conf`,