pmcf 6.24.0 → 6.25.0

package/README.md

@@ -62,6 +62,7 @@ generates config packages for:
         *   [Parameters](#parameters-8)
     *   [templateContent](#templatecontent)
         *   [Parameters](#parameters-9)
+    *   [enabled](#enabled)
     *   [isTemplate](#istemplate)
     *   [expand](#expand)
         *   [Parameters](#parameters-10)
@@ -78,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)
@@ -218,6 +219,10 @@ Returns **any** 
 
 Returns **AsyncIterable\<ContentProvider>**&#x20;
 
+### enabled
+
+Returns **[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)**&#x20;
+
 ### isTemplate
 
 Returns **[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)**&#x20;
@@ -296,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>
@@ -392,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/bin/pmcf-info

@@ -2,15 +2,25 @@
 import { extendingAttributeIterator } from "pacc";
 import { prepare } from "../src/cli.mjs";
 
-const { root, args, options } = await prepare({});
+const { root, args, options } = await prepare({
+  maxDepth: {
+    type: "string",
+    short: "m"
+  }
+});
 
 for (const expression of args) {
   const result = root.expression(expression);
 
-  show(result);
+  show(result, 0, { short: false, maxDepth: options.maxDepth });
 }
 
-function show(value, indent = 0, short = false) {
+function show(value, indent = 0, options = { short: false, maxDepth: 5 }) {
+  if (indent >= options.maxDepth) {
+    console.log("...");
+    return;
+  }
+
   switch (typeof value) {
     case "string":
     case "number":
@@ -23,7 +33,7 @@ function show(value, indent = 0, short = false) {
 
   if (value instanceof Iterator || Array.isArray(value)) {
     for (const v of value) {
-      show(v, indent);
+      show(v, indent, options);
     }
   } else {
     const type = value.constructor;
@@ -32,7 +42,12 @@ function show(value, indent = 0, short = false) {
     const name = (attribute, l = indent + 1) =>
       prefix(l) + attribute.name.padEnd(ml) + ": ";
 
-    if (short) {
+    if (value instanceof Set || Array.isArray(value)) {
+      console.log([...value].join(" "));
+      return;
+    }
+
+    if (options.short) {
       console.log(`${prefix()}${value[type.key]}:`);
     } else {
       console.log(`${prefix()}${value.fullName}(${type.name}):`);
@@ -71,9 +86,14 @@ function show(value, indent = 0, short = false) {
       if (v !== undefined) {
         if (attribute.collection) {
           if (attribute.backpointer) {
-            console.log(name(attribute));
-            for (const o of v.values()) {
-              show(o, indent + 2, true);
+            if (indent + 2 >= options.maxDepth) {
+              console.log(name(attribute), "...");
+            } else {
+              console.log(name(attribute));
+
+              for (const o of v.values()) {
+                show(o, indent + 2, { ...options, short: true });
+              }
             }
           } else {
             const l = [...v];

package/package.json

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

package/src/network-interfaces/network-interface.mjs

@@ -1,7 +1,8 @@
 import { join } from "node:path";
 import {
   string_attribute_writable,
-  default_collection_attribute_writable
+  default_collection_attribute_writable,
+  number_attribute_writable
 } from "pacc";
 import { network_attribute } from "../common-attributes.mjs";
 import { Host, cidrAddresses, addType } from "pmcf";
@@ -52,7 +53,12 @@ export class NetworkInterface extends SkeletonNetworkInterface {
       private: true
     },
     hwaddr: { ...string_attribute_writable, name: "hwaddr" },
-    destination: { ...string_attribute_writable, name: "destination" }
+    destination: { ...string_attribute_writable, name: "destination" },
+
+/*
+    InitialCongestionWindow: { ...number_attribute_writable, name: "InitialCongestionWindow", default: 10, configurable: true },
+    InitialAdvertisedReceiveWindow: { ...number_attribute_writable, name: "InitialAdvertisedReceiveWindow", default: 10, configurable: true },
+    */
   };
 
   static {

package/src/service-types.mjs

@@ -77,14 +77,38 @@ export const ServiceTypes = {
   },
   ldap: {
     endpoints: [
-      { family: FAMILY_IPV4, scheme: "ldap", protocol: "tcp", port: 389, tls: false },
-      { family: FAMILY_IPV6, scheme: "ldap", protocol: "tcp", port: 389, tls: false }
+      {
+        family: FAMILY_IPV4,
+        scheme: "ldap",
+        protocol: "tcp",
+        port: 389,
+        tls: false
+      },
+      {
+        family: FAMILY_IPV6,
+        scheme: "ldap",
+        protocol: "tcp",
+        port: 389,
+        tls: false
+      }
     ]
   },
   ldaps: {
     endpoints: [
-      { family: FAMILY_IPV4, scheme: "ldaps", protocol: "tcp", port: 636, tls: true },
-      { family: FAMILY_IPV6, scheme: "ldaps", protocol: "tcp", port: 636, tls: true }
+      {
+        family: FAMILY_IPV4,
+        scheme: "ldaps",
+        protocol: "tcp",
+        port: 636,
+        tls: true
+      },
+      {
+        family: FAMILY_IPV6,
+        scheme: "ldaps",
+        protocol: "tcp",
+        port: 636,
+        tls: true
+      }
     ]
   },
   ldapi: {
@@ -92,21 +116,57 @@ export const ServiceTypes = {
   },
   http: {
     endpoints: [
-      { family: FAMILY_IPV4, scheme: "http", protocol: "tcp", port: 80, tls: false },
-      { family: FAMILY_IPV6, scheme: "http", protocol: "tcp", port: 80, tls: false }
+      {
+        family: FAMILY_IPV4,
+        scheme: "http",
+        protocol: "tcp",
+        port: 80,
+        tls: false
+      },
+      {
+        family: FAMILY_IPV6,
+        scheme: "http",
+        protocol: "tcp",
+        port: 80,
+        tls: false
+      }
     ]
   },
   https: {
     endpoints: [
-      { family: FAMILY_IPV4, scheme: "https", protocol: "tcp", port: 443, tls: true },
-      { family: FAMILY_IPV6, scheme: "https", protocol: "tcp", port: 443, tls: true }
+      {
+        family: FAMILY_IPV4,
+        scheme: "https",
+        protocol: "tcp",
+        port: 443,
+        tls: true
+      },
+      {
+        family: FAMILY_IPV6,
+        scheme: "https",
+        protocol: "tcp",
+        port: 443,
+        tls: true
+      }
     ],
     dnsRecord: { type: "HTTPS", parameters: { alpn: "h2" } }
   },
   http3: {
     endpoints: [
-      { family: FAMILY_IPV4, scheme: "https", protocol: "udp", port: 443, tls: true },
-      { family: FAMILY_IPV6, scheme: "https", protocol: "udp", port: 443, tls: true }
+      {
+        family: FAMILY_IPV4,
+        scheme: "https",
+        protocol: "udp",
+        port: 443,
+        tls: true
+      },
+      {
+        family: FAMILY_IPV6,
+        scheme: "https",
+        protocol: "udp",
+        port: 443,
+        tls: true
+      }
     ],
     dnsRecord: {
       type: "HTTPS",
@@ -168,13 +228,18 @@ export const ServiceTypes = {
       { family: FAMILY_IPV6, protocol: "udp", port: 546, tls: false }
     ]
   },
-  "dhcpv6-server": { endpoints: [{ family: FAMILY_IPV6, port: 547, tls: false }] },
+  "dhcpv6-server": {
+    endpoints: [{ family: FAMILY_IPV6, port: 547, tls: false }]
+  },
   smb: {
     endpoints: [
       { family: FAMILY_IPV4, protocol: "tcp", port: 445, tls: false },
       { family: FAMILY_IPV6, protocol: "tcp", port: 445, tls: false }
     ]
   },
+  nginx: {
+    extends: ["http", "https", "http3"]
+  },
   timemachine: {
     extends: ["smb"],
     dnsRecord: {

package/src/services/bind.mjs

@@ -401,7 +401,8 @@ class bind_group extends Base {
             );
 
             const reverseZone =
-              this.hasReverse && na.subnet.prefix &&
+              this.hasReverse &&
+              na.subnet.prefix &&
               this._zones.getOrInsertComputed(
                 reverseArpa(na.subnet.prefix),
                 domain =>
@@ -585,6 +586,10 @@ function addressesStatement(prefix, objects, empty = false, indent = "") {
 
 export class bind extends ExtraSourceService {
   static attributes = {
+    forwarders: {
+      ...default_collection_attribute,
+      name: "forwarders"
+    },
     groups: {
       ...default_collection_attribute_writable,
       name: "groups",
@@ -647,7 +652,7 @@ export class bind extends ExtraSourceService {
     return this.primaries ? "secondary" : "primary";
   }
 
-  async writeForwarders(outputControl) {
+  get forwarders() {
     const forwarders = serviceEndpoints(this.source, {
       services: "services[types[dns] && priority>=100 && priority<200]",
       endpoints: endpoint => endpoint.family !== FAMILY_DNS,
@@ -655,6 +660,12 @@ export class bind extends ExtraSourceService {
       limit: 5
     });
 
+    return forwarders;
+  }
+
+  async writeForwarders(outputControl) {
+    const forwarders = this.forwarders;
+
     if (forwarders.length) {
       await writeLines(
         join(outputControl.dir, "etc/named/options"),