pmcf 6.7.4 → 6.8.0

package/README.md

@@ -77,26 +77,26 @@ generates config packages for:
 *   [domainNames](#domainnames)
 *   [InitializationContext](#initializationcontext)
     *   [Parameters](#parameters-13)
+*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
+    *   [networkAddresses](#networkaddresses)
+        *   [Parameters](#parameters-14)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-14)
+        *   [Parameters](#parameters-15)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-15)
+        *   [Parameters](#parameters-16)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-16)
+    *   [Parameters](#parameters-17)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-17)
-*   [cidrAddresses](#cidraddresses)
     *   [Parameters](#parameters-18)
-*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
-    *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-19)
+*   [cidrAddresses](#cidraddresses)
+    *   [Parameters](#parameters-19)
 *   [families](#families)
 *   [secretName](#secretname)
 *   [directHosts](#directhosts)
@@ -286,6 +286,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;
+
 ## SystemdJournalRemoteService
 
 **Extends CoreService**
@@ -361,18 +373,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

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+import { extendingAttributeIterator } from "pacc";
 import { prepare } from "../src/cli.mjs";
 
 const { root, args, options } = await prepare({});
@@ -15,7 +16,14 @@ function show(value) {
       show(v);
     }
   } else {
-    console.log(`${value.fullName}:`);
+    console.log(`${value.fullName}(${value.constructor.name}):`);
+
+    for (const [path, attribute] of extendingAttributeIterator(
+      value,
+      attribute => !attribute.private
+    )) {
+      console.log(path);
+    }
     ex(value);
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.7.4",
+  "version": "6.8.0",
   "publishConfig": {
     "access": "public"
   },
@@ -52,8 +52,8 @@
   "dependencies": {
     "aggregated-map": "^1.0.7",
     "content-entry-transform": "^1.6.9",
-    "ip-utilties": "^3.6.2",
-    "npm-pkgbuild": "^20.8.1",
+    "ip-utilties": "^3.7.0",
+    "npm-pkgbuild": "^20.8.2",
     "pacc": "^10.4.1",
     "package-directory": "^8.2.0",
     "yaml": "^2.9.0"

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

@@ -101,7 +101,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
   }
 
   get hostName() {
-    return this.attribute("_hostName") ?? this.host.hostName;
+    return this.attribute("_hostName") ?? this.host?.hostName;
   }
 
   set hostName(value) {

package/src/owner.mjs

@@ -172,7 +172,7 @@ export class Owner extends ServiceOwner {
   }
 
   *networkAddresses(filter) {
-    for (const host of this.hosts) {
+    for (const host of this.hosts.values()) {
       yield* host.networkAddresses(filter);
     }
   }

package/src/services/kea.mjs

@@ -143,9 +143,13 @@ export class kea extends CoreService {
 
     const network = this.network;
     const host = this.host;
+
+    const source = host.owner;
     const name = host.name;
 
-    const dnsServerEndpoints = serviceEndpoints(network, {
+    //console.log(source.fullName, [...source.hosts.keys()]);
+
+    const dnsServerEndpoints = serviceEndpoints(source, {
       services: "services[types[dns] && priority>=300]",
       endpoints: endpoint => endpoint.networkInterface?.kind !== "loopback"
     });
@@ -156,7 +160,7 @@ export class kea extends CoreService {
 
     const peers = async family =>
       Array.from(
-        network.expression(
+        source.expression(
           `services[types[kea] && priority>=${Math.min(this.priority, 100)}]`
         )
       )
@@ -350,7 +354,7 @@ export class kea extends CoreService {
     const hwmap = new Map();
     const hostNames = new Set();
 
-    for await (const { networkInterface } of network.networkAddresses()) {
+    for await (const { networkInterface } of source.networkAddresses()) {
       if (networkInterface.hwaddr) {
         if (!hostNames.has(networkInterface.hostName)) {
           hwmap.set(networkInterface.hwaddr, networkInterface);
@@ -379,7 +383,7 @@ export class kea extends CoreService {
             "client-classes": ["SKIP_DDNS"]
           };
         })
-        .sort((a, b) => a.hostname.localeCompare(b.hostname));
+        .sort((a, b) => a.hostname?.localeCompare(b.hostname));
 
     const listenInterfaces = family =>
       this.endpoints(