pmcf 6.66.11 → 6.67.1

package/README.md

@@ -71,7 +71,7 @@ generates config packages for:
 *   [expression](#expression)
     *   [Parameters](#parameters-11)
 *   [isTemplate](#istemplate-1)
-*   [PortEndpoint](#portendpoint)
+*   [port\_endpoint](#port_endpoint)
     *   [Parameters](#parameters-12)
     *   [port](#port)
     *   [socketAddress](#socketaddress)
@@ -81,31 +81,31 @@ generates config packages for:
 *   [domainNames](#domainnames)
 *   [InitializationContext](#initializationcontext)
     *   [Parameters](#parameters-14)
+*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
+    *   [networkAddresses](#networkaddresses)
+        *   [Parameters](#parameters-15)
 *   [Interface](#interface)
 *   [zones](#zones)
 *   [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)
 *   [priority](#priority-1)
 *   [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)
 *   [subnetForAddress](#subnetforaddress)
@@ -261,9 +261,9 @@ Returns **any** 
 
 Returns **[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** 
 
-## PortEndpoint
+## port\_endpoint
 
-**Extends BaseEndpoint**
+**Extends base\_endpoint**
 
 Endpoint with an ip port
 
@@ -282,9 +282,9 @@ Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/G
 
 ## url\_endpoint
 
-**Extends BaseEndpoint**
+**Extends base\_endpoint**
 
-Endpoint based on url
+endpoint based on url
 
 ### Parameters
 
@@ -308,6 +308,18 @@ Keeps track of all in flight object creations and loose ends during config initi
 
 *   `directory`   (optional, default `"/"`)
 
+## SkeletonNetworkInterface
+
+**Extends Interface**
+
+### networkAddresses
+
+#### Parameters
+
+*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
+
+Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
+
 ## Interface
 
 **Extends ServiceOwner**
@@ -405,18 +417,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 Interface**
-
-### 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/bin/pmcf-diagram

@@ -4,7 +4,7 @@ import { prepare } from "../src/cli.mjs";
 
 const { root, args } = await prepare();
 
-const location = root.expression(args[0]);
+const site = root.expression(args[0]);
 
 function q(str) {
   return str.match(/^\w+$/) ? str : `"${str}"`;
@@ -12,7 +12,7 @@ function q(str) {
 
 console.log("graph G {");
 console.log("  node [shape=record];");
-for await (const host of location.hosts.values()) {
+for await (const host of site.hosts.values()) {
   if (host.clusters.size === 0) {
     console.log(
       `  ${q(host.name)} [label="${host.name}|{${[
@@ -25,7 +25,7 @@ for await (const host of location.hosts.values()) {
   }
 }
 
-for await (const network of location.networks.values()) {
+for await (const network of site.networks.values()) {
   console.log(
     `  ${q(network.name)} [label="${network.name}\\n${[...network.subnets.keys()]
       .map(s => s.address)
@@ -46,7 +46,7 @@ for await (const network of location.networks.values()) {
   }
 }
 
-for await (const cluster of location.clusters.values()) {
+for await (const cluster of site.clusters.values()) {
   console.log(`  subgraph cluster_${cluster.name} {`);
 
   for (const ni of cluster.members) {
@@ -73,7 +73,7 @@ for await (const cluster of location.clusters.values()) {
 }
 
 /*
-for (const bridge of location.bridges) {
+for (const bridge of site.bridges) {
   console.log(` ${[...bridge].map(b => q(b.name)).join(" -- ")};`);
 }
 */

package/package.json

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

package/src/core-service.mjs

@@ -15,8 +15,8 @@ import {
 import {
   base,
   host,
-  Endpoint,
-  DomainNameEndpoint,
+  endpoint,
+  domain_endpoint,
   url_endpoint,
   unix_endpoint
 } from "pmcf";
@@ -182,13 +182,13 @@ export class CoreService extends base {
                 result.push(he);
               }
             } else {
-              result.push(new Endpoint(this, na, options));
+              result.push(new endpoint(this, na, options));
             }
           }
 
           if (!domainNames.has(this.domainName)) {
             domainNames.add(this.domainName);
-            result.push(new DomainNameEndpoint(this, this.domainName, options));
+            result.push(new domain_endpoint(this, this.domainName, options));
           }
           break;
       }

package/src/endpoint.mjs

@@ -5,8 +5,7 @@ import { CoreService } from "./core-service.mjs";
 import { family_attribute, endpointAttributes } from "./common-attributes.mjs";
 import { FAMILY_DNS, FAMILY_UNIX, PROTOCOL_TCP } from "./constants.mjs";
 
-class BaseEndpoint {
-  static name = "base_endpoint";
+class base_endpoint {
   static priority = 1.1;
   static owners = [CoreService, "network_interface"];
   static key = "type";
@@ -54,9 +53,7 @@ class BaseEndpoint {
 /**
  * Endpoint with an ip port
  */
-class PortEndpoint extends BaseEndpoint {
-  static name = "port_endpoint";
-
+class port_endpoint extends base_endpoint {
   static {
     addType(this);
   }
@@ -95,8 +92,7 @@ class PortEndpoint extends BaseEndpoint {
   }
 }
 
-export class Endpoint extends PortEndpoint {
-  static name = "endpoint";
+export class endpoint extends port_endpoint {
   static attributes = {
     family: family_attribute,
     addressType: { ...string_attribute, name: "addressType" }
@@ -136,8 +132,7 @@ export class Endpoint extends PortEndpoint {
   }
 }
 
-export class DomainNameEndpoint extends PortEndpoint {
-  static name = "domain_endpoint";
+export class domain_endpoint extends port_endpoint {
   static attributes = {
     domainName: { ...string_attribute, name: "domainName" }
   };
@@ -169,9 +164,9 @@ export class DomainNameEndpoint extends PortEndpoint {
 }
 
 /**
- * Endpoint based on url
+ * endpoint based on url
  */
-export class url_endpoint extends BaseEndpoint {
+export class url_endpoint extends base_endpoint {
   static attributes = {
     url: url_attribute,
     addressType: { ...string_attribute, name: "addressType" }
@@ -262,7 +257,7 @@ export class url_endpoint extends BaseEndpoint {
   }
 }
 
-export class unix_endpoint extends BaseEndpoint {
+export class unix_endpoint extends base_endpoint {
   static attributes = {
     url: url_attribute
   };

package/src/interfaces/network-interface.mjs

@@ -1,6 +1,7 @@
 import { join } from "node:path";
 import {
   string_attribute_writable,
+  string_set_attribute_writable,
   default_collection_attribute_writable
 } from "pacc";
 import { network_attribute } from "../common-attributes.mjs";
@@ -54,6 +55,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
     },
     hwaddr: { ...string_attribute_writable, name: "hwaddr" },
     dhcpClientId: { ...string_attribute_writable, name: "dhcpClientId" },
+    dhcpClientClasses: { ...string_set_attribute_writable, name: "dhcpClientClasses" },
     destination: { ...string_attribute_writable, name: "destination" }
 
     /*

package/src/services/bind.mjs

@@ -21,7 +21,7 @@ import {
 import {
   base,
   CoreService,
-  Endpoint,
+  endpoint,
   endpointAddresses,
   addresses,
   networkAddressType,
@@ -753,7 +753,7 @@ export class bind extends CoreService {
   static attributes = {
     forwarders: {
       ...default_collection_attribute_writable,
-      type: Endpoint,
+      type: endpoint,
       name: "forwarders",
       deferredExpression: true
     },

package/src/services/kea.mjs

@@ -19,7 +19,7 @@ import {
   addType,
   Subnet,
   CoreService,
-  Endpoint,
+  endpoint,
   sortDescendingByPriority,
   bind_key,
   systemdCredentialFileName,
@@ -66,7 +66,7 @@ export class kea extends CoreService {
     },
     dnsServerEndpoints: {
       ...default_collection_attribute_writable,
-      type: Endpoint,
+      type: endpoint,
       name: "dnsServerEndpoints",
       deferredExpression: true
     },
@@ -424,7 +424,7 @@ export class kea extends CoreService {
       [...hwmap]
         .map(([k, networkInterface]) => {
           let ip = {};
-          let addr = networkInterface.networkAddress(
+          const addr = networkInterface.networkAddress(
             n => n.family === `IPv${family}`
           )?.address;
 
@@ -435,20 +435,31 @@ export class kea extends CoreService {
                 : { "ip-address": addr };
           }
 
-          let ids = { "hw-address": k };
+          const other = {
+            "hw-address": k
+          };
 
-          if (family === "4") {
-            const dhcpClientId = networkInterface.dhcpClientId;
-            if (dhcpClientId !== undefined) {
-              ids = { "client-id": dhcpClientId };
-            }
+          switch (family) {
+            case "4":
+              {
+                const dhcpClientId = networkInterface.dhcpClientId;
+                if (dhcpClientId !== undefined) {
+                  other["client-id"] = dhcpClientId;
+                  delete other["hw-address"];
+                }
+              }
+              break;
+          }
+
+          const dhcpClientClasses = networkInterface.dhcpClientClasses;
+          if (dhcpClientClasses !== undefined) {
+            other["client-classes"] = [...dhcpClientClasses];
           }
 
           return {
-            ...ids,
-            ...ip,
             hostname: networkInterface.domainName,
-            "client-classes": ["SKIP_DDNS"]
+            ...ip,
+            ...other
           };
         })
         .sort((a, b) => a.hostname?.localeCompare(b.hostname));